Browse Source

查询图表数据,如果指标数据不存在则继续查询下一个指标

xyxie 9 months ago
parent
commit
7be219ce78
1 changed files with 8 additions and 8 deletions
  1. 8 8
      services/data/excel/balance_table.go

+ 8 - 8
services/data/excel/balance_table.go

@@ -90,10 +90,10 @@ func GetBalanceExcelChartList(excelInfo *excelModel.ExcelInfo, lang string) (lis
 		}
 		for _, mapping := range mappingListTmp {
 			mappingListMap[mapping.ChartInfoId] = append(mappingListMap[mapping.ChartInfoId], mapping)
-			err, errMsg = GetBalanceExcelEdbData(mapping, newExcelDataMap, dataListMap, excelAllRows, excelAllCols)
-			if err != nil {
-				err = fmt.Errorf(" 获取图表,指标信息失败 Err:%s", err.Error())
-				return
+			er, ms := GetBalanceExcelEdbData(mapping, newExcelDataMap, dataListMap, excelAllRows, excelAllCols)
+			if er != nil {
+				utils.FileLog.Info(fmt.Sprintf(" 获取图表,指标信息失败 Err:%s, %s", er.Error(), ms))
+				continue
 			}
 		}
 	}
@@ -420,10 +420,10 @@ func GetBalanceExcelChartSingle(chartInfoId, ChartEdbId int, lang string) (mappi
 	}
 
 	for _, mapping := range mappingListTmp {
-		err, errMsg = GetBalanceExcelEdbData(mapping, newExcelDataMap, dataListMap, excelAllRows, excelAllCols)
-		if err != nil {
-			err = fmt.Errorf(" 获取图表,指标信息失败 Err:%s", err.Error())
-			return
+		er, msg := GetBalanceExcelEdbData(mapping, newExcelDataMap, dataListMap, excelAllRows, excelAllCols)
+		if er != nil {
+			utils.FileLog.Info(fmt.Sprintf(" 获取图表,指标信息失败 Err:%s, %s", er.Error(), msg))
+			continue
 		}
 	}
 	return