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

controllers/data_manage/excel/balance_table.go

@@ -462,7 +462,7 @@ func (c *ExcelInfoController) GetBalanceChartList() {
 		return
 	}
 	list := make([]*data_manage.ChartInfoDetailResp, 0)
-	chartInfoList, mappingListMap, dataListMap, err, errMsg := excelService.GetBalanceExcelChartList(excelInfo)
+	chartInfoList, mappingListMap, dataListMap, err, errMsg := excelService.GetBalanceExcelChartList(excelInfo, "")
 	if err != nil {
 		if errMsg != "" {
 			br.Msg = errMsg

services/data/excel/balance_table.go

@@ -14,7 +14,7 @@ import (
 )
 
 // 将表格信息转化成指标数据
-func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo) (newDataMap map[int]map[int]request.MixedTableCellDataReq, allRows, allCols int, err error, errMsg string) {
+func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo, lang string) (newDataMap map[int]map[int]request.MixedTableCellDataReq, allRows, allCols int, err error, errMsg string) {
 	var result request.MixedTableReq
 	err = json.Unmarshal([]byte(excelDetail.Content), &result)
 	if err != nil {
@@ -48,8 +48,8 @@ func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo) (newDataMap map[int]
 	return
 }
 
-func GetBalanceExcelChartList(excelInfo *excelModel.ExcelInfo) (list []*data_manage.ChartInfoView, mappingListMap map[int][]*excelModel.ExcelChartEdb, dataListMap map[int][]*data_manage.EdbDataList, err error, errMsg string) {
-	newExcelDataMap, excelAllRows, excelAllCols, err, errMsg := GetBalanceExcelData(excelInfo)
+func GetBalanceExcelChartList(excelInfo *excelModel.ExcelInfo, lang string) (list []*data_manage.ChartInfoView, mappingListMap map[int][]*excelModel.ExcelChartEdb, dataListMap map[int][]*data_manage.EdbDataList, err error, errMsg string) {
+	newExcelDataMap, excelAllRows, excelAllCols, err, errMsg := GetBalanceExcelData(excelInfo, lang)
 	if err != nil {
 		return
 	}