|
@@ -590,7 +590,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if chartType == 2 {
|
|
|
+ if chartType == 2 && v.IsAxis == 0 {
|
|
|
latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
|
|
|
if tmpErr != nil {
|
|
|
|
|
@@ -3226,6 +3226,9 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
}
|
|
|
|
|
|
for _, mappingItem := range dataList {
|
|
|
+ if mappingItem.IsAxis == 1 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
quarterDataList := mappingItem.DataList.(data_manage.QuarterDataList)
|
|
|
|
|
|
if seasonConfig.MaxMinLimits.Year > 0 {
|