|
@@ -1717,6 +1717,10 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+ // 不包含今年
|
|
|
+ if dateTime.Year() == time.Now().Year() {
|
|
|
+ continue
|
|
|
+ }
|
|
|
newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
|
|
|
// 处理均值
|
|
|
if value, ok := valueMap[newDate]; ok {
|
|
@@ -1780,6 +1784,10 @@ func SeasonChartData(dataList []*models.ChartEdbInfoMapping, seasonExtraConfig s
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+ // 不包含今年
|
|
|
+ if dateTime.Year() == time.Now().Year() {
|
|
|
+ continue
|
|
|
+ }
|
|
|
newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
|
|
|
// 处理均值
|
|
|
if value, ok := valueMap[newDate]; ok {
|