xyxie 1 tahun lalu
induk
melakukan
37d72b8761
1 mengubah file dengan 2 tambahan dan 3 penghapusan
  1. 2 3
      services/data/chart_info.go

+ 2 - 3
services/data/chart_info.go

@@ -1022,7 +1022,6 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		}
 	}*/
 	itemLength := len(result.List[length-1].Items)
-	maxY := result.List[length-1].Year
 	//获取数据的最新日期
 	lastDate := result.List[length-1].Items[itemLength-1].DataTime
 	lastDateT, tmpErr := time.Parse(utils.FormatDate, lastDate)
@@ -1099,10 +1098,10 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	}
 
 	//判断哪些点应该落在同一条时间线上
-	/*maxY := lastDateT.Year()
+	maxY := lastDateT.Year()
 	if lastDateT.Month() >= 11 && jumpYear == 1 {
 		maxY = maxY + 1
-	}*/
+	}
 	endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
 	endTmpT, _ := time.Parse(utils.FormatDate, endTmp)
 	minY := maxY