|
@@ -687,6 +687,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
}
|
|
|
endYear := lastDateT.Year()
|
|
|
nowYear := time.Now().Year()
|
|
|
+ chartLegendMaxYear := 0
|
|
|
dataMap := make(map[string]data_manage.QuarterXDateItem, 0)
|
|
|
|
|
|
quarterDataList := make([]*data_manage.QuarterData, 0)
|
|
@@ -732,6 +733,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
EndDate: endT,
|
|
|
ShowName: showName,
|
|
|
}
|
|
|
+ chartLegendMaxYear = endT.Year()
|
|
|
dataMap[name] = item
|
|
|
chartLegendMap[name] = idx
|
|
|
idx++
|
|
@@ -744,7 +746,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
lenYear := len(dataMap)
|
|
|
for k, v := range dataMap {
|
|
|
if i, ok := chartLegendMap[k]; ok {
|
|
|
- v.ChartLegend = strconv.Itoa(endYear - lenYear + i)
|
|
|
+ v.ChartLegend = strconv.Itoa(chartLegendMaxYear - lenYear + i)
|
|
|
}
|
|
|
dataMap[k] = v
|
|
|
}
|
|
@@ -877,6 +879,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
}
|
|
|
endYear := lastDateT.Year()
|
|
|
nowYear := time.Now().Year()
|
|
|
+ chartLegendMaxYear := 0
|
|
|
dataMap := make(map[string]data_manage.QuarterXDateItem, 0)
|
|
|
|
|
|
quarterDataList := make([]*data_manage.QuarterData, 0)
|
|
@@ -921,6 +924,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
EndDate: endT,
|
|
|
ShowName: showName,
|
|
|
}
|
|
|
+ chartLegendMaxYear = endT.Year()
|
|
|
dataMap[showName] = item
|
|
|
fmt.Println("年份" + showName + "日期" + startStr + " " + endStr)
|
|
|
startTmpT = startT
|
|
@@ -935,7 +939,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
lenYear := len(dataMap)
|
|
|
for k, v := range dataMap {
|
|
|
if i, ok := chartLegendMap[k]; ok {
|
|
|
- v.ChartLegend = strconv.Itoa(endYear - lenYear + i)
|
|
|
+ v.ChartLegend = strconv.Itoa(chartLegendMaxYear - lenYear + i)
|
|
|
}
|
|
|
dataMap[k] = v
|
|
|
}
|