图表bug

services/data/chart_info.go

@@ -801,7 +801,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 	if length == 0 {
 		return
 	}
-	legendMap := make(map[string]string)
+	legendMap := make(map[string]string, 0)
 	if len(legends) > 0 {
 		for _, v := range legends {
 			legendMap[v.Name] = v.Value
@@ -830,10 +830,10 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 		return
 	}
 	endYear := lastDateT.Year()
-	dataMap := make(map[string]data_manage.QuarterXDateItem)
+	dataMap := make(map[string]data_manage.QuarterXDateItem, 0)
 
 	quarterDataList := make([]*data_manage.QuarterData, 0)
-	quarterMap := make(map[string][]*data_manage.EdbDataList)
+	quarterMap := make(map[string][]*data_manage.EdbDataList, 0)
 
 	//整理出日期
 	leftNameFlag := true
@@ -972,7 +972,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	if length == 0 {
 		return
 	}
-	legendMap := make(map[string]string)
+	legendMap := make(map[string]string, 0)
 	if len(legends) > 0 {
 		for _, v := range legends {
 			legendMap[v.Name] = v.Value
@@ -997,11 +997,11 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		return
 	}
 	endYear := lastDateT.Year()
-	dataMap := make(map[string]data_manage.QuarterXDateItem)
+	dataMap := make(map[string]data_manage.QuarterXDateItem, 0)
 
 	quarterDataList := make([]*data_manage.QuarterData, 0)
 	resultData := make([]*data_manage.QuarterData, 0)
-	quarterMap := make(map[string][]*data_manage.EdbDataList)
+	quarterMap := make(map[string][]*data_manage.EdbDataList, 0)
 	//整理出日期
 	leftNameFlag := true
 	for currentStartYear := startYear; currentStartYear <= endYear; currentStartYear++ {
@@ -1051,7 +1051,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		dataMap[k] = v
 	}
 
-	yearDataListMap := make(map[int]*data_manage.EdbDataItems)
+	yearDataListMap := make(map[int]*data_manage.EdbDataItems, 0)
 
 	for _, lv := range result.List {
 		yearDataListMap[lv.Year] = lv
@@ -1079,7 +1079,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	for name, dateItem := range dataMap {
 		lv, ok1 := yearDataListMap[dateItem.EndDate.Year()]
 		if !ok1 {
-			break
+			continue
 		}
 
 		for _, item := range lv.Items {
@@ -1097,10 +1097,8 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 					// 切割的日期时间字符串
 					cuttingDataTimeStr := latestDate.AddDate(0, 0, lv.BetweenDay).Format(utils.FormatDate)
 					if item.DataTime == cuttingDataTimeStr {
-						if dv, ok1 := dataMap[name]; ok1 {
-							dv.CuttingDataTimestamp = item.DataTimestamp
-							dataMap[name] = dv
-						}
+						dateItem.CuttingDataTimestamp = item.DataTimestamp
+						dataMap[name] = dateItem
 					}
 				}
 			}