Merge remote-tracking branch 'origin/debug' into debug

services/data/chart_info.go

@@ -834,9 +834,6 @@ 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)
@@ -886,7 +883,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 			StartDate:   startT,
 			EndDate:     endT,
 			ShowName:    showName,
-			ChartLegend: strconv.Itoa(endT.Year()),
+			ChartLegend: strconv.Itoa(startT.Year()),
 		}
 		dataMap[name] = item
 	}
@@ -986,7 +983,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
@@ -1007,9 +1009,6 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		currentEndYear := currentStartYear
 		if jumpYear == 1 {
 			currentEndYear = currentStartYear + 1
-			if currentEndYear > endYear {
-				break
-			}
 		}
 		endStr := fmt.Sprintf("%d-%s", currentEndYear, xEndDate)
 		showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
@@ -1034,7 +1033,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 			StartDate:   startT,
 			EndDate:     endT,
 			ShowName:    showName,
-			ChartLegend: strconv.Itoa(endT.Year()),
+			ChartLegend: strconv.Itoa(startT.Year()),
 		}
 		dataMap[showName] = item
 	}
@@ -1106,7 +1105,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		quarterDataList = append(quarterDataList, quarterItem)
 	}
 
-	if result.List[0].Year != calendarPreYear || jumpYear == 1 {
+	if result.List[0].Year != calendarPreYear {
 		itemList := make([]*data_manage.EdbDataList, 0)
 		items := new(data_manage.QuarterData)
 		//items.Year = calendarPreYear