..

services/data/chart_info.go

@@ -820,6 +820,9 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 		return
 	}
 	startYear := startDateT.Year()
+	if jumpYear == 1 {
+		startYear = startYear - 1
+	}
 	//获取数据的最新日期
 	lastDate := dataList[length-1].DataTime
 	lastDateT, tmpErr := time.Parse(utils.FormatDate, lastDate)
@@ -981,7 +984,12 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	//判断横轴的两个时间之间是不是跨年了，如果跨年了，则横轴截止年份比起始年份+1，如果不跨年，截止年份等于起始年份
 	//根据数据确定最早的年份，和最近年份
 	//根据横轴的日期，汇总所有的年份
-	startYear := calendarPreYear
+	startYear := result.List[0].Year
+	if jumpYear == 1 {
+		if startYear != calendarPreYear {
+			startYear = startYear - 1
+		}
+	}
 	itemLength := len(result.List[length-1].Items)
 	//获取数据的最新日期
 	lastDate := result.List[length-1].Items[itemLength-1].DataTime
@@ -1072,7 +1080,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 
 	for name, dateItem := range dataMap {
 		lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
-		if result.List[0].Year == calendarPreYear {
+		if result.List[0].Year == calendarPreYear && jumpYear == 0 {
 			lv, ok1 = yearDataListMap[dateItem.StartDate.Year()]
 		}
 		if !ok1 {
@@ -1123,7 +1131,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		quarterDataList = append(quarterDataList, quarterItem)
 	}
 
-	if result.List[0].Year != calendarPreYear {
+	if result.List[0].Year != calendarPreYear || jumpYear == 1 {
 		itemList := make([]*data_manage.EdbDataList, 0)
 		items := new(data_manage.QuarterData)
 		//items.Year = calendarPreYear