|
@@ -798,6 +798,9 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
|
}
|
|
|
for k, v := range dataMap {
|
|
|
itemList := quarterMap[k]
|
|
|
+ if len(itemList) == 0 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
quarterItem := new(data_manage.QuarterData)
|
|
|
quarterItem.Years = v.ShowName
|
|
|
quarterItem.ChartLegend = v.ChartLegend
|
|
@@ -925,7 +928,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
EndDate: endT,
|
|
|
ShowName: showName,
|
|
|
}
|
|
|
- //chartLegendMaxYear = endT.Year()
|
|
|
+ chartLegendMaxYear = endT.Year()
|
|
|
dataMap[showName] = item
|
|
|
fmt.Println("年份" + showName + "日期" + startStr + " " + endStr)
|
|
|
startTmpT = startT
|
|
@@ -940,8 +943,8 @@ 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)
|
|
|
+ //v.ChartLegend = strconv.Itoa(endYear - lenYear + i)
|
|
|
+ v.ChartLegend = strconv.Itoa(chartLegendMaxYear - lenYear + i)
|
|
|
}
|
|
|
dataMap[k] = v
|
|
|
}
|
|
@@ -1018,6 +1021,9 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
|
|
|
|
for k, v := range dataMap {
|
|
|
itemList := quarterMap[k]
|
|
|
+ if len(itemList) == 0 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
quarterItem := new(data_manage.QuarterData)
|
|
|
quarterItem.Years = v.ShowName
|
|
|
quarterItem.ChartLegend = v.ChartLegend
|