|
|
@@ -137,8 +137,8 @@ func getIncomeListV2(ch chan models.IncomeChartResp) (incomeChart models.IncomeC
|
|
|
startDate = fmt.Sprint(startDate, "-01")
|
|
|
|
|
|
//结束日期
|
|
|
- endDateTime := timeNow.AddDate(0, -i+1, 0)
|
|
|
- endDate := endDateTime.Format("2006-01")
|
|
|
+ endDateTime := timeNow.AddDate(0, -i+1, -1)
|
|
|
+ endDate := endDateTime.Format(utils.FormatDate)
|
|
|
|
|
|
//因为就算是当月的后续事件还没到，也要计入数据统计，所以不做限制到当天处理
|
|
|
//if endDateTime.After(time.Now()) {
|
|
|
@@ -146,7 +146,6 @@ func getIncomeListV2(ch chan models.IncomeChartResp) (incomeChart models.IncomeC
|
|
|
//} else {
|
|
|
// endDate = fmt.Sprint(endDate, "-01")
|
|
|
//}
|
|
|
- endDate = fmt.Sprint(endDate, "-01")
|
|
|
|
|
|
cond := `1 = 1`
|
|
|
pars := make([]interface{}, 0)
|
ziwen