|
@@ -744,6 +744,9 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
}
|
|
|
}
|
|
|
lenYear := len(dataMap)
|
|
|
+ if chartLegendMaxYear > endYear {
|
|
|
+ chartLegendMaxYear = endYear
|
|
|
+ }
|
|
|
for k, v := range dataMap {
|
|
|
if i, ok := chartLegendMap[k]; ok {
|
|
|
//v.ChartLegend = strconv.Itoa(endYear - lenYear + i)
|
|
@@ -941,6 +944,9 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
}
|
|
|
}
|
|
|
lenYear := len(dataMap)
|
|
|
+ if chartLegendMaxYear > endYear {
|
|
|
+ chartLegendMaxYear = endYear
|
|
|
+ }
|
|
|
for k, v := range dataMap {
|
|
|
if i, ok := chartLegendMap[k]; ok {
|
|
|
//v.ChartLegend = strconv.Itoa(endYear - lenYear + i)
|