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