|
|
@@ -1095,10 +1095,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
}
|
|
|
|
|
|
//判断哪些点应该落在同一条时间线上
|
|
|
- maxY := lastDateT.Year()
|
|
|
- if lastDateT.Month() >= 11 && jumpYear == 1 {
|
|
|
- maxY = maxY + 1
|
|
|
- }
|
|
|
+ maxY := nowYear
|
|
|
endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
|
|
|
endTmpT, _ := time.Parse(utils.FormatDate, endTmp)
|
|
|
minY := maxY
|
