zwxi 8 mēneši atpakaļ
vecāks
revīzija
0cbc95a304
1 mainītis faili ar 9 papildinājumiem un 0 dzēšanām
  1. 9 0
      services/data/chart_info.go

+ 9 - 0
services/data/chart_info.go

@@ -3341,6 +3341,10 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 							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 := maxValueMap[newDate]; ok {
@@ -3369,6 +3373,10 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 							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 := maxValueMap[newDate]; ok {
@@ -3651,6 +3659,7 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
 						}
 					} else {
 						averge += vv.Value
+						length +=1
 					}
 				}
 				averge = averge / float64(length)