Browse Source

平衡表指标数据来源

xyxie 9 months ago
parent
commit
3137e993ab
2 changed files with 25 additions and 20 deletions
  1. 1 1
      services/data/chart_info_excel_balance.go
  2. 24 19
      services/data/excel/balance_table.go

+ 1 - 1
services/data/chart_info_excel_balance.go

@@ -1671,7 +1671,7 @@ func TransferChartEdbToEdbMappingFormat(chartInfoId, chartType int, mappingListT
 		startDateStr, endDateStr, _, endVal, maxValue, minValue := getBalanceDataListStartDateAndValue(dataList)
 		mapping := &data_manage.ChartEdbInfoMapping{
 			EdbInfoId:         v.ExcelChartEdbId,
-			SourceName:        "",
+			SourceName:        "平衡表",
 			Source:            0,
 			SubSource:         0,
 			EdbCode:           v.EdbCode,

+ 24 - 19
services/data/excel/balance_table.go

@@ -375,14 +375,31 @@ func GetBalanceExcelChartSingle(chartInfoId, ChartEdbId int, lang string) (mappi
 		err = fmt.Errorf(" 获取图表,指标信息失败 Err:%s", err.Error())
 		return
 	}
-	dataListMap = make(map[int][]*data_manage.EdbDataList)
-	//查询库里是否有值
-	chartDataList, e := excelModel.GetExcelChartDataByChartInfoId(chartInfoId)
-	if e != nil {
-		err = fmt.Errorf(" 获取图表,指标信息失败 Err:%s", e.Error())
+	// 查询所有子表
+	excelInfoId := mappingListTmp[0].ExcelInfoId
+	excelInfo, err := excelModel.GetExcelInfoById(excelInfoId)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			errMsg = "表格不存在"
+			err = fmt.Errorf(errMsg)
+			return
+		}
+		errMsg = "查询子表失败"
+		err = fmt.Errorf(" 查询子表失败图表,指标信息失败 Err:%s", err.Error())
 		return
 	}
-	if len(chartDataList) > 0 {
+	dataListMap = make(map[int][]*data_manage.EdbDataList)
+	if excelInfo.BalanceType == 1 {
+		//查询库里是否有值
+		chartDataList, e := excelModel.GetExcelChartDataByChartInfoId(chartInfoId)
+		if e != nil {
+			err = fmt.Errorf(" 获取图表,指标信息失败 Err:%s", e.Error())
+			return
+		}
+		if len(chartDataList) == 0 {
+			err = fmt.Errorf(" 获取图表,指标数据不存在")
+			return
+		}
 		for _, v := range chartDataList {
 			tmp := &data_manage.EdbDataList{
 				EdbDataId:     v.ExcelChartDataId,
@@ -395,19 +412,7 @@ func GetBalanceExcelChartSingle(chartInfoId, ChartEdbId int, lang string) (mappi
 		}
 		return
 	}
-	excelInfoId := mappingListTmp[0].ExcelInfoId
-	// 查询所有子表
-	excelInfo, err := excelModel.GetExcelInfoById(excelInfoId)
-	if err != nil {
-		if err.Error() == utils.ErrNoRow() {
-			errMsg = "表格不存在"
-			err = fmt.Errorf(errMsg)
-			return
-		}
-		errMsg = "查询子表失败"
-		err = fmt.Errorf(" 查询子表失败图表,指标信息失败 Err:%s", err.Error())
-		return
-	}
+
 	// 获取图表详情
 	newExcelDataMap, excelAllRows, excelAllCols, err, errMsg := GetBalanceExcelData(excelInfo, lang)
 	if err != nil {