zwxi 6 months ago
parent
commit
8b88a5fe1f
1 changed files with 9 additions and 2 deletions
  1. 9 2
      services/data/chart_info.go

+ 9 - 2
services/data/chart_info.go

@@ -4182,6 +4182,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 			dataTimeList := make([]string, 0)
 			valueMap := make(map[time.Time]float64)
 			averageDataList := make([]*data_manage.SamePeriodAverageData, 0)
+			dateNumMap := make(map[time.Time]float64)
 			for i := len(quarterDataList) - 1; i >= 0; i-- {
 				// 插值成日度
 				dataTimeList, _, err = HandleDataByLinearRegressionToList(quarterDataList[i].DataList, handleDataMap)
@@ -4214,16 +4215,22 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					} else {
 						valueMap[newDate] = handleDataMap[date]
 					}
+					dateNumMap[newDate] += 1
 
 					dataTimeMap[newDate] = newDate
 				}
 			}
 
-			year := float64(seasonConfig.SamePeriodAverage.Year)
+			//year := float64(seasonConfig.SamePeriodAverage.Year)
 			for _, v := range dataTimeMap {
 				averageItem := &data_manage.SamePeriodAverageData{}
+				year := dateNumMap[v]
 				if value, ok := valueMap[v]; ok {
-					averageItem.Value = value / year
+					if year > 0 {
+						averageItem.Value = value / year
+					} else {
+						averageItem.Value = value
+					}
 				}
 				averageItem.DataTime = v.Format(utils.FormatDate)
 				averageItem.DataTimestamp = v.UnixNano() / 1e6