|
|
@@ -3487,11 +3487,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // 不包含2月29号
|
|
|
- if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
+ // 不包含当年
|
|
|
+ if v.ChartLegend == strconv.Itoa(time.Now().Year()) {
|
|
|
continue
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 不包含2月29号
|
|
|
if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
continue
|
|
|
@@ -3641,7 +3641,6 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
dataTimeMap := make(map[time.Time]time.Time)
|
|
|
dataTimeList := make([]string, 0)
|
|
|
valueMap := make(map[time.Time]float64)
|
|
|
-
|
|
|
averageDataList := make([]*data_manage.SamePeriodAverageData, 0)
|
|
|
for i := len(quarterDataList) - 1; i > len(quarterDataList)-seasonConfig.SamePeriodAverage.Year && i > 0; i-- {
|
|
|
// 插值成日度
|
|
|
@@ -3656,6 +3655,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ // 不包含2月29号
|
|
|
+ if dateTime.Month() == 2 && dateTime.Day() == 29 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
|
|
|
// 处理均值
|
|
|
if value, ok := valueMap[newDate]; ok {
|
zwxi