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

# Conflicts:
#	controllers/data_manage/excel/balance_table.go
#	services/data/excel/balance_table.go
#	services/data/excel/excel_info.go

controllers/data_manage/excel/balance_table.go

@@ -446,7 +446,7 @@ func (c *ExcelInfoController) BalanceChartInfoAdd() {
 	// 判断如果是静态表，则查询表数据，落库
 	dataListMap := make(map[int][]*data_manage.EdbDataList)
 	if excelInfo.BalanceType == 1 {
-		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(excelInfo, "")
+		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(excelInfo, c.Lang)
 		if e != nil {
 			br.Msg = "获取表格数据失败"
 			if errMsg != "" {
@@ -621,7 +621,7 @@ func (c *ExcelInfoController) BalanceChartInfoEdit() {
 	// 判断如果是静态表，则查询表数据，落库
 	dataListMap := make(map[int][]*data_manage.EdbDataList)
 	if excelInfo.BalanceType == 1 {
-		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(excelInfo, "")
+		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(excelInfo, c.Lang)
 		if e != nil {
 			br.Msg = "获取表格数据失败"
 			if errMsg != "" {
@@ -1086,7 +1086,7 @@ func (c *ExcelInfoController) AddStaticExcel() {
 	for k, childExcelInfo := range childExcelList {
 		//得到表格数据并落库
 
-		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(childExcelInfo, "")
+		newExcelDataMap, excelAllRows, excelAllCols, e, errMsg := excelService.GetBalanceExcelData(childExcelInfo, c.Lang)
 		if e != nil {
 			br.Msg = "获取表格数据失败"
 			if errMsg != "" {
@@ -1115,7 +1115,7 @@ func (c *ExcelInfoController) AddStaticExcel() {
 			}
 		}
 
-		content, e := excelService.TransferBalanceExcelContentToStatic(childExcelInfo, "")
+		content, e := excelService.TransferBalanceExcelContentToStatic(childExcelInfo, c.Lang)
 		if e != nil {
 			br.Msg = "动态内容转成静态失败"
 			br.ErrMsg = fmt.Sprintf("动态内容转成静态失败 %s", e.Error())
@@ -1354,7 +1354,7 @@ func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 	br.IsAddLog = true
 }
 
-func downloadBalanceTable(excelInfo *excel.ExcelInfo) (savePath, zipName string, uploadDir string, err error, errMsg string) {
+func downloadBalanceTable(excelInfo *excel.ExcelInfo, lang string) (savePath, zipName string, uploadDir string, err error, errMsg string) {
 	dateDir := time.Now().Format("20060102")
 	randStr := time.Now().Format(utils.FormatDateTimeUnSpace)
 	uploadDir = "static/xls/" + dateDir + "/" + randStr
@@ -1400,7 +1400,7 @@ func downloadBalanceTable(excelInfo *excel.ExcelInfo) (savePath, zipName string,
 				err = fmt.Errorf("表格json转结构体失败，Err:" + err.Error())
 				return
 			}
-			newResult, er, msg := excelService.GetMixedTableCellData(result, "")
+			newResult, er, msg := excelService.GetMixedTableCellData(result, lang)
 			if er != nil {
 				err = er
 				errMsg = msg
@@ -1471,7 +1471,7 @@ func downloadBalanceTable(excelInfo *excel.ExcelInfo) (savePath, zipName string,
 	return
 }
 
-func refreshBalanceTable(excelDetail response.ExcelInfoDetail) (err error) {
+func refreshBalanceTable(excelDetail response.ExcelInfoDetail, lang string) (err error) {
 	edbInfoIds := make([]int, 0)
 	edbInfoIdExist := make(map[int]bool)
 	if excelDetail.ParentId > 0 {
@@ -1512,7 +1512,7 @@ func refreshBalanceTable(excelDetail response.ExcelInfoDetail) (err error) {
 				return
 			}
 			var newData [][]request.MixedTableCellDataReq
-			newData, err, _ = excelService.GetMixedTableCellData(result, "")
+			newData, err, _ = excelService.GetMixedTableCellData(result, lang)
 			if err != nil {
 				return
 			}

controllers/data_manage/excel/excel_info.go

@@ -2181,7 +2181,7 @@ func (c *ExcelInfoController) Refresh() {
 	}
 
 	if excelDetail.Source == utils.BALANCE_TABLE {
-		err = refreshBalanceTable(excelDetail)
+		err = refreshBalanceTable(excelDetail, c.Lang)
 		if err != nil {
 			br.Msg = "刷新失败"
 			br.ErrMsg = "刷新失败,Err:" + err.Error()
@@ -2302,7 +2302,7 @@ func (c *ExcelInfoController) Download() {
 			return
 		}
 	case utils.BALANCE_TABLE: // 混合表格
-		savePath, fileName, uploadDir, err, errMsg := downloadBalanceTable(excelInfo)
+		savePath, fileName, uploadDir, err, errMsg := downloadBalanceTable(excelInfo, c.Lang)
 		if err != nil {
 			br.Msg = "下载失败"
 			if errMsg != `` {

services/data/excel/balance_table.go

@@ -21,7 +21,6 @@ func GetBalanceExcelData(excelDetail *excelModel.ExcelInfo, lang string) (newDat
 		err = errors.New("表格json转结构体失败，Err:" + err.Error())
 		return
 	}
-	//todo 语言兼容
 	newData, tmpErr, tmpErrMsg := GetMixedTableCellData(result, lang)
 	if tmpErr != nil {
 		errMsg = "获取失败"
@@ -465,8 +464,7 @@ func TransferBalanceExcelContentToStatic(excelDetail *excelModel.ExcelInfo, lang
 		return
 	}
 	cellRelationConf = string(cellRelationConfByte)
-
-	newData, tmpErr, tmpErrMsg := GetMixedTableCellData(mixedTableReq, "")
+	newData, tmpErr, tmpErrMsg := GetMixedTableCellData(mixedTableReq, lang)
 	if tmpErr != nil {
 		err = errors.New(tmpErrMsg + "获取最新的数据失败 ，Err:" + tmpErr.Error())
 		return

services/data/excel/excel_info.go

@@ -70,6 +70,7 @@ func formatExcelInfo2Detail(excelInfo *excel.ExcelInfo, sysUserId int, lang stri
 			}
 		}
 	}
+
 	// 数据权限
 	haveOperaAuth, err := data_manage_permission.CheckExcelPermissionByExcelInfoId(checkExcelInfo.ExcelInfoId, checkExcelInfo.ExcelClassifyId, checkExcelInfo.IsJoinPermission, sysUserId)
 	if err != nil {