Merge branch 'bzq1/bug_6744_chart_time' of eta_server/eta_api into debug

controllers/data_manage/edb_info.go

@@ -4685,7 +4685,9 @@ func (this *ChartInfoController) EdbInfoDataSeasonal() {
 	}
 	var latestDateT time.Time
 	if edbInfo.LatestDate != "" {
+		// 季节性图需要特殊处理最近N年数据
 		latestDateT, _ = time.Parse(utils.FormatDate, edbInfo.LatestDate)
+		latestDateT = time.Date(latestDateT.Year()+1, 1, 1, 0, 0, 0, 0, time.Local)
 	}
 
 	startDate, endDate = utils.GetDateByDateTypeV2(dateType, startDate, endDate, startYear, latestDateT)

controllers/data_manage/predict_edb_info.go

@@ -1489,6 +1489,10 @@ func (this *PredictEdbInfoController) DataList() {
 		latestDateT, _ := time.Parse(utils.FormatDate, edbInfo.LatestDate)
 		maxDate = latestDateT
 	}
+	if chartType == utils.CHART_TYPE_SEASON && dateType == utils.DateTypeNYears {
+		// 季节性图需要特殊处理最近N年数据
+		maxDate = time.Date(maxDate.Year()+1, 1, 1, 0, 0, 0, 0, time.Local)
+	}
 
 	startDate, endDate = utils.GetDateByDateTypeV2(dateType, startDate, endDate, startYear, maxDate)
 	if endDate == "" {