月度累计计算方式修改

controller/census/invoice_payment.go

@@ -1212,6 +1212,9 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						totalMoneySlice = append(totalMoneySlice, accumulate)
+						if startDateTime.Month() == 12 {
+							accumulate = 0
+						}
 					} else if req.ListParam == "0" {
 						totalMoneySlice = append(totalMoneySlice, amountTotal)
 					} else if i > 0 || i == numMonth {
@@ -1223,8 +1226,8 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime) {
 				//全部走旧查询
 				//fmt.Println("旧查询")
-				fmt.Println("st:",st)
-				fmt.Println("ed:",ed)
+				//fmt.Println("st:",st)
+				//fmt.Println("ed:",ed)
 				histrtyCond += ` AND (invoice_time BETWEEN ? AND ? )`
 				historyPars = append(historyPars, st, ed)
 				//fmt.Println("st:",st)
@@ -1249,6 +1252,9 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						totalMoneySlice = append(totalMoneySlice, accumulate)
+						if startDateTime.Month() == 12 {
+							accumulate = 0
+						}
 					} else if req.ListParam == "0" {
 						totalMoneySlice = append(totalMoneySlice, amountTotal)
 					} else if i > 0 || i == numMonth {
@@ -1303,6 +1309,9 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
+						if prevStartDateTime.Month() == 12 {
+							historyAccumulate = 0
+						}
 					} else if req.ListParam == "0" {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, prevAmountTotal)
 					} else if i > 0 || i == numMonth {
@@ -1336,6 +1345,9 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 				if i == j || i == numMonth {
 					if req.ListParam == "4" {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
+						if prevStartDateTime.Month() == 12 {
+							historyAccumulate = 0
+						}
 					} else if req.ListParam == "0" {
 						prevTotalMoneySlice = append(prevTotalMoneySlice, amountTotal)
 					} else if i > 0 || i == numMonth {