xyxie преди 1 година
родител
ревизия
18917e1d62
променени са 1 файла, в които са добавени 11 реда и са изтрити 3 реда
  1. 11 3
      services/data/chart_info.go

+ 11 - 3
services/data/chart_info.go

@@ -878,6 +878,13 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 		year := dataTimeT.Year()
 		newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
 		for k, dateItem := range dataMap {
+			tmpVal := data_manage.EdbDataList{
+				EdbDataId:     v.EdbDataId,
+				EdbInfoId:     v.EdbInfoId,
+				DataTime:      v.DataTime,
+				DataTimestamp: v.DataTimestamp,
+				Value:         v.Value,
+			}
 			if (dateItem.StartDate.Before(dataTimeT) && dateItem.EndDate.After(dataTimeT)) || dateItem.StartDate == dataTimeT || dateItem.EndDate == dataTimeT {
 				if jumpYear == 1 {
 					//计算前一年最大的日期, 只补齐数据到去年
@@ -892,12 +899,13 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 					newItemDate = dataTimeT.AddDate(nowYear-year, 0, 0)
 				}
 				timestamp := newItemDate.UnixNano() / 1e6
-				v.DataTimestamp = timestamp
+				tmpVal.DataTimestamp = timestamp
+				tmpV := &tmpVal
 				if findVal, ok := quarterMap[k]; !ok {
-					findVal = append(findVal, v)
+					findVal = append(findVal, tmpV)
 					quarterMap[k] = findVal
 				} else {
-					findVal = append(findVal, v)
+					findVal = append(findVal, tmpV)
 					quarterMap[k] = findVal
 				}