。。

services/chart/chart_info.go

@@ -641,9 +641,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 						err = errors.New("获取农历数据失败,Err:" + tmpErr.Error())
 						return
 					}
-					endDateTmp := dataList[len(dataList)-1].DataTime
-					endDateForm, _ := time.Parse(utils.FormatDate, endDateTmp)
-					quarterDataList, tErr := GetSeasonEdbInfoDataListByXDateNong(result, latestDate, seasonExtraConfig, calendarPreYear, int(endDateForm.Month()))
+					quarterDataList, tErr := GetSeasonEdbInfoDataListByXDateNong(result, latestDate, seasonExtraConfig, calendarPreYear)
 					if tErr != nil {
 						err = errors.New("获取季节性图表数据失败,Err:" + tErr.Error())
 						return
@@ -858,7 +856,8 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*edbDataModel.EdbDataList, lates
 }
 
 // GetSeasonEdbInfoDataListByXDateNong 季节性图的指标数据根据横轴选择农历时展示
-func GetSeasonEdbInfoDataListByXDateNong(result *edbDataModel.EdbDataResult, latestDate time.Time, seasonExtraConfig string, calendarPreYear, thisMonth int) (quarterDataListSort edbDataModel.QuarterDataList, err error) {
+// GetSeasonEdbInfoDataListByXDateNong 季节性图的指标数据根据横轴选择农历时展示
+func GetSeasonEdbInfoDataListByXDateNong(result *edbDataModel.EdbDataResult, latestDate time.Time, seasonExtraConfig string, calendarPreYear int) (quarterDataListSort edbDataModel.QuarterDataList, err error) {
 	xStartDate := "01-01"
 	xEndDate := "12-31"
 	jumpYear := 0
@@ -956,6 +955,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *edbDataModel.EdbDataResult, lat
 			ShowName:  showName,
 		}
 		dataMap[showName] = item
+
 		if lastDateT.Before(endT) {
 			//如果最新的日期在起始日之前，则跳出循环
 			break
@@ -977,15 +977,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *edbDataModel.EdbDataResult, lat
 	}
 
 	//判断哪些点应该落在同一条时间线上
-	maxY := 0
-	for _, lv := range result.List {
-		for _, item := range lv.Items {
-			dataTimeT, _ := time.Parse(utils.FormatDate, item.DataTime)
-			if dataTimeT.Year() > maxY {
-				maxY = dataTimeT.Year()
-			}
-		}
-	}
+	maxY := lastDateT.Year()
 	endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
 	endTmpT, _ := time.Parse(utils.FormatDate, endTmp)
 	minY := maxY
@@ -997,14 +989,8 @@ func GetSeasonEdbInfoDataListByXDateNong(result *edbDataModel.EdbDataResult, lat
 
 	for name, dateItem := range dataMap {
 		lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
-		if thisMonth > 11 {
-			lv, ok1 = yearDataListMap[dateItem.EndDate.Year()-1]
-		}
-		if dateItem.EndDate.Year() > maxY {
+		if dateItem.EndDate.Year() > lastDateT.Year() {
 			lv, ok1 = yearDataListMap[dateItem.StartDate.Year()]
-			if thisMonth > 11 {
-				lv, ok1 = yearDataListMap[dateItem.StartDate.Year()-1]
-			}
 		}
 		if !ok1 {
 			continue