处理正常年份的最新时间轴

services/data/chart_info.go

@@ -1100,10 +1100,12 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 
 	//判断哪些点应该落在同一条时间线上
 	maxY := lastDateT.Year()
+	changeFlag := false
 	if lastDateT.Month() >= 11 {
 		maxY = maxY + 1
 	}
 	if maxY < nowYear {
+		changeFlag = true
 		maxY = nowYear
 	}
 	endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
@@ -1118,7 +1120,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	fmt.Println("横轴截取日" + startTmpT.Format(utils.FormatDate) + " " + endTmpT.Format(utils.FormatDate))
 	for name, dateItem := range dataMap {
 		lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
-		if dateItem.EndDate.Year() > lastDateT.Year() {
+		if changeFlag {
 			lv, ok1 = yearDataListMap[dateItem.StartDate.Year()]
 		}
 		if !ok1 {