Merge branch 'ETA_1.9.4' into debug

services/data/chart_info.go

@@ -3853,6 +3853,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 {
@@ -3881,6 +3885,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 {
@@ -4163,6 +4171,7 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
 						}
 					} else {
 						averge += vv.Value
+						length +=1
 					}
 				}
 				averge = averge / float64(length)