Merge branch 'service_types'

controller/census/invoice_payment.go

@@ -1069,6 +1069,13 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		} else {
 			cond += ` AND 1 = 2`
 		}
+		// 勾选套餐筛选时忽略导入的历史数据
+		if req.StartDate == "" {
+			req.StartDate = "2023-04"
+			req.EndDate = "3023-04"
+		} else {
+			req.StartDate = "2023-04"
+		}
 	}
 
 
@@ -1303,7 +1310,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 						partAccumulate = 0.0
 					}
 				}
-			} else if (endDateTime.Before(historyTime) || endDateTime.Equal(historyTime)) && req.ServiceTypes == "" {
+			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime)  {
 				//全部走旧查询
 				//fmt.Println("旧查询")
 				//fmt.Println("st:",st)
@@ -1407,7 +1414,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 						partHistoryAccumulate = 0.0 // 清零部分历史金额
 					}
 				}
-			} else if (prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime)) && req.ServiceTypes == "" {
+			} else if prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime) {
 				// 全部走旧查询
 				fmt.Println("prevSt:", prevSt)
 				fmt.Println("prevEd:", prevEd)