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

controllers/data_manage/excel/balance_table.go

@@ -1076,9 +1076,15 @@ func (c *ExcelInfoController) ModifyBalanceExcelVersion() {
 
 	excelInfo.ModifyTime = time.Now()
 	excelInfo.VersionName = req.VersionName
-	//updateExcelInfoParams := []string{"ModifyTime", "VersionName"}
-	// 同步修改静态表中的图表和指标名称
-
+	updateExcelInfoParams := []string{"ModifyTime", "VersionName"}
+	// todo 同步修改静态表中的图表和指标名称
+	// ETA表格信息变更
+	err = excelInfo.Update(updateExcelInfoParams)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + err.Error()
+		return
+	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

models/data_manage/excel/excel_info.go

@@ -682,47 +682,3 @@ func GetChildExcelInfoByParentId(parentId int) (items []*ExcelInfo, err error) {
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 	return
 }
-
-// ExcelInfoVersionRename 平衡表版本号重命名
-func ExcelInfoVersionRename(excelInfo *ExcelInfo, updateExcelInfoParams []string, excelEdbMappingList []*ExcelEdbMapping) (err error) {
-	o, err := orm.NewOrmUsingDB("data").Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			_ = o.Rollback()
-		} else {
-			_ = o.Commit()
-		}
-	}()
-
-	// ETA表格信息变更
-	_, err = o.Update(excelInfo, updateExcelInfoParams...)
-	if err != nil {
-		return
-	}
-
-	// 同步更新图表数据
-	//更新父级分类时，同时更新子集分类
-	if excelInfo.Source == utils.BALANCE_TABLE && excelInfo.ParentId == 0 {
-		// 同步更新子表分类
-		sql := `UPDATE FROM excel_info set excel_classify_id = ? WHERE parent_id=? `
-		_, err = o.Raw(sql, excelInfo.ExcelClassifyId, excelInfo.ExcelInfoId).Exec()
-	}
-	// 删除关系表
-	sql := `DELETE FROM excel_edb_mapping WHERE excel_info_id=? `
-	_, err = o.Raw(sql, excelInfo.ExcelInfoId).Exec()
-
-	// excel与指标的关联关系
-	dataNum := len(excelEdbMappingList)
-	if dataNum > 0 {
-		for k, v := range excelEdbMappingList {
-			v.ExcelInfoId = excelInfo.ExcelInfoId
-			excelEdbMappingList[k] = v
-		}
-		_, err = o.InsertMulti(dataNum, excelEdbMappingList)
-	}
-
-	return
-}

routers/commentsRouter.go

@@ -880,6 +880,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/excel:ExcelInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/excel:ExcelInfoController"],
+        beego.ControllerComments{
+            Method: "ModifyBalanceExcelVersion",
+            Router: `/excel_info/balance/version/modify`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/excel:ExcelInfoController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage/excel:ExcelInfoController"],
         beego.ControllerComments{
             Method: "GetBaseEdbInfo",

services/data/chart_info_excel_balance.go

@@ -1311,7 +1311,7 @@ func AddBalanceStaticExcel(oldExcelInfoId int, versionName string, sysUser *syst
 	}
 	if parentId == 0 && len(childExcelList) > 0 {
 		for _, childExcelInfo := range childExcelList {
-			_, err, errMsg, isSendEmail = AddBalanceStaticExcel(childExcelInfo.ExcelInfoId, "", sysUser, excelInfo.ExcelInfoId, relExcelInfoId, balanceType, []*excelModel.ExcelInfo{})
+			_, err, errMsg, isSendEmail = AddBalanceStaticExcel(childExcelInfo.ExcelInfoId, versionName, sysUser, excelInfo.ExcelInfoId, relExcelInfoId, balanceType, []*excelModel.ExcelInfo{})
 			if err != nil {
 				return
 			}
@@ -1444,10 +1444,11 @@ func copyBalanceExcelChart(oldChartInfo *data_manage.ChartInfoView, sysUserId in
 	}
 
 	if count > 0 {
-		errMsg = "图表已存在，请重新填写"
+		/*errMsg = "图表已存在，请重新填写"
 		err = fmt.Errorf("判断图表名称是否存在失败")
 		isSendEmail = false
-		return
+		return*/
+		oldChartInfo.ChartName += " " + strconv.Itoa(count)
 	}
 
 	chartInfo = new(data_manage.ChartInfo)