Jelajahi Sumber

Merge branch 'ETA_1.9.4' into debug

zwxi 8 bulan lalu
induk
melakukan
42995d07b4
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      services/data/chart_info.go

+ 2 - 2
services/data/chart_info.go

@@ -3921,7 +3921,8 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 							} else {
 								// 如果跨年且大于等于一年
 								// double后截取
-								newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year() - 1, 0, 0)
+								newDate = dateTime.AddDate(time.Now().Year()-dateTime.Year()-1, 0, 0)
+								startDate = startDate.AddDate(-1, 0, 0)
 								if newDate.After(startDate) {
 									// 处理上下限列表
 									if value, ok := maxValueMap[newDate]; ok {
@@ -3965,7 +3966,6 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 									dataTimeMap[newDate] = newDate
 								}
 
-
 							}
 						} else {
 							// 如果不跨年 正常获取