Browse Source

Merge branch 'feature/eta1.8.5_excel_balance' into debug

# Conflicts:
#	services/data/chart_info_excel_balance.go
xyxie 10 months ago
parent
commit
61d953134e
1 changed files with 0 additions and 2 deletions
  1. 0 2
      services/data/chart_info_excel_balance.go

+ 0 - 2
services/data/chart_info_excel_balance.go

@@ -880,7 +880,6 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 		} else {
 			//err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.EdbInfoId))
 			utils.FileLog.Info(fmt.Sprintf("获取失败,指标数据异常 %d", v.EdbInfoId))
-			continue
 		}
 		if v.IsConvert == 1 {
 			switch v.ConvertType {
@@ -1604,7 +1603,6 @@ func TransferChartEdbToEdbMappingFormat(chartInfoId, chartType int, mappingListT
 		} else {
 			//err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.ExcelChartEdbId))
 			utils.FileLog.Info(fmt.Sprintf("获取失败,指标数据异常 %d", v.ExcelChartEdbId))
-			continue
 		}
 		startDateStr, endDateStr, _, endVal, maxValue, minValue := getBalanceDataListStartDateAndValue(dataList)
 		mapping := &data_manage.ChartEdbInfoMapping{