|
|
@@ -1069,12 +1069,12 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
}
|
|
|
endTmp := fmt.Sprintf("%d-%s", maxY, xEndDate)
|
|
|
endTmpT, _ := time.Parse(utils.FormatDate, endTmp)
|
|
|
- /*minY := maxY
|
|
|
+ minY := maxY
|
|
|
if jumpYear == 1 {
|
|
|
minY = maxY - 1
|
|
|
}
|
|
|
startTmp := fmt.Sprintf("%d-%s", minY, xStartDate)
|
|
|
- startTmpT, _ := time.Parse(utils.FormatDate, startTmp)*/
|
|
|
+ startTmpT, _ := time.Parse(utils.FormatDate, startTmp)
|
|
|
|
|
|
for name, dateItem := range dataMap {
|
|
|
lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
|
|
|
@@ -1084,7 +1084,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
|
|
|
for _, item := range lv.Items {
|
|
|
dataTimeT, _ := time.Parse(utils.FormatDate, item.DataTime)
|
|
|
- if (endTmpT.After(dataTimeT)) || endTmpT == dataTimeT {
|
|
|
+ if (startTmpT.Before(dataTimeT) && endTmpT.After(dataTimeT)) || startTmpT == dataTimeT || endTmpT == dataTimeT {
|
|
|
if findVal, ok := quarterMap[name]; !ok {
|
|
|
findVal = append(findVal, item)
|
|
|
quarterMap[name] = findVal
|
