Merge remote-tracking branch 'origin/debug' into debug

services/data/chart_info.go

@@ -908,12 +908,11 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 		}
 		dataMap[name] = item
 	}
-
-	for _, v := range dataList {
-		dataTimeT, _ := time.Parse(utils.FormatDate, v.DataTime)
-		year := dataTimeT.Year()
-		newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
-		for k, dateItem := range dataMap {
+	for k, dateItem := range dataMap {
+		for _, v := range dataList {
+			dataTimeT, _ := time.Parse(utils.FormatDate, v.DataTime)
+			year := dataTimeT.Year()
+			newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
 			if (dateItem.StartDate.Before(dataTimeT) && dateItem.EndDate.After(dataTimeT)) || dateItem.StartDate == dataTimeT || dateItem.EndDate == dataTimeT {
 				if jumpYear == 1 {
 					//计算前一年最大的日期, 只补齐数据到去年
@@ -937,7 +936,6 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 					dateItem.CuttingDataTimestamp = v.DataTimestamp
 					dataMap[k] = dateItem
 				}
-				break
 			}
 		}
 	}