|
@@ -1071,13 +1071,9 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
timestamp := newItemDate.UnixNano() / 1e6
|
|
|
tmpVal.DataTimestamp = timestamp
|
|
|
tmpV := &tmpVal
|
|
|
- if findVal, ok := quarterMap[k]; !ok {
|
|
|
- findVal = append(findVal, tmpV)
|
|
|
- quarterMap[k] = findVal
|
|
|
- } else {
|
|
|
- findVal = append(findVal, tmpV)
|
|
|
- quarterMap[k] = findVal
|
|
|
- }
|
|
|
+ findVal, _ := quarterMap[k]
|
|
|
+ findVal = append(findVal, tmpV)
|
|
|
+ quarterMap[k] = findVal
|
|
|
|
|
|
if v.DataTime == latestDateStr {
|
|
|
dateItem.CuttingDataTimestamp = timestamp
|
|
@@ -1300,13 +1296,10 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
// tmpVal.DataTimestamp = timestamp
|
|
|
if (startTmpT.Before(dataTimeT) && endTmpT.After(dataTimeT)) || startTmpT == dataTimeT || endTmpT == dataTimeT {
|
|
|
tmpV := &tmpVal
|
|
|
- if findVal, ok := quarterMap[name]; !ok {
|
|
|
- findVal = append(findVal, tmpV)
|
|
|
- quarterMap[name] = findVal
|
|
|
- } else {
|
|
|
- findVal = append(findVal, tmpV)
|
|
|
- quarterMap[name] = findVal
|
|
|
- }
|
|
|
+ findVal, _ := quarterMap[name]
|
|
|
+ findVal = append(findVal, tmpV)
|
|
|
+ quarterMap[name] = findVal
|
|
|
+
|
|
|
if lv.Year >= latestDateYear {
|
|
|
// 切割的日期时间字符串
|
|
|
cuttingDataTimeStr := latestDate.AddDate(0, 0, lv.BetweenDay).Format(utils.FormatDate)
|