fix

controller/census/invoice_payment.go

@@ -1070,12 +1070,12 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			cond += ` AND 1 = 2`
 		}
 		// 勾选套餐筛选时忽略导入的历史数据
-		//if req.StartDate == "" {
-		//	req.StartDate = "2023-04"
-		//	req.EndDate = "3023-04"
-		//} else {
-		//	req.StartDate = "2023-04"
-		//}
+		if req.StartDate == "" {
+			req.StartDate = "2023-04"
+			req.EndDate = "3023-04"
+		} else {
+			req.StartDate = "2023-04"
+		}
 	}
 
 
@@ -1177,12 +1177,12 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			endDateTime = reqStartDate.AddDate(0, i+1, -1)
 			prevEndDateTime = reqStartDate.AddDate(-1, i+1, -1)
 			if reqEndDate.After(latestTime) {
-				endDateTime = latestTime.AddDate(0, i-numMonth+1, -1)
-				prevEndDateTime = latestTime.AddDate(-1, i-numMonth+1, -1)
+				endDateTime = latestTime.AddDate(0, i+1, -1)
+				prevEndDateTime = latestTime.AddDate(-1, i+1, -1)
 			}
 		} else {
-			endDateTime = latestTime.AddDate(0, i-numMonth+1, -1)
-			prevEndDateTime = latestTime.AddDate(-1, i-numMonth+1, -1)
+			endDateTime = latestTime.AddDate(0, i+1, -1)
+			prevEndDateTime = latestTime.AddDate(-1, i+1, -1)
 		}
 		endDate = endDateTime.Format(utils.FormatDate)
 		prevEndDate = prevEndDateTime.Format(utils.FormatDate)