zwxi 8 months ago
parent
commit
37b670b81c
2 changed files with 5 additions and 2 deletions
  1. 4 1
      services/data/chart_info.go
  2. 1 1
      services/data/chart_info_excel_balance.go

+ 4 - 1
services/data/chart_info.go

@@ -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 {
 				//item.DataList = dataList
@@ -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 {

+ 1 - 1
services/data/chart_info_excel_balance.go

@@ -939,7 +939,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 			}
 		}
 
-		if chartType == 2 {
+		if chartType == 2 && v.IsAxis == 0 {
 			latestDate, tmpErr := time.Parse(utils.FormatDate, v.LatestDate)
 			if tmpErr != nil {
 				//item.DataList = dataList