|
@@ -885,7 +885,11 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
beforeYearMaxDateT, _ := time.Parse(utils.FormatDate, beforeYearMaxDate)
|
|
|
if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
|
|
|
newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
|
|
|
+ } else {
|
|
|
+ newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
|
}
|
|
|
+ } else {
|
|
|
+ newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
|
}
|
|
|
timestamp := newItemDate.UnixNano() / 1e6
|
|
|
v.DataTimestamp = timestamp
|
|
@@ -901,7 +905,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
dateItem.CuttingDataTimestamp = v.DataTimestamp
|
|
|
dataMap[k] = dateItem
|
|
|
}
|
|
|
- break
|
|
|
+ //break
|
|
|
}
|
|
|
}
|
|
|
}
|