。。

models/data_manage/excel/excel_info.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"strconv"
 	"time"
 )
 
@@ -647,9 +648,8 @@ func GetExcelBaseInfoByExcelInfoIdList(excelInfoIdList []int) (items []*ExcelBas
 	return
 }
 
-/*
 // ReplaceEdbInExcel 替换表格中的指标
-func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelList []*ExcelInfo) (err error) {
+func ReplaceEdbInExcel(oldEdbInfoId, newEdbInfoId int, updateExcelList []*ExcelInfo) (err error) {
 	var errmsg string
 	logMsg := `` // 记录替换的日志
 	replaceTotal := 0
@@ -664,7 +664,7 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelL
 		} else {
 			_ = to.Commit()
 			if logMsg != `` {
-				utils.FileLog.Info(fmt.Sprintf("替换表格中的指标记录，替换总表格数：%d,旧的指标id:%d，新的指标id:%d;%s", replaceTotal, oldEdbInfo.EdbInfoId, newEdbInfo.EdbInfoId, logMsg))
+				utils.FileLog.Info(fmt.Sprintf("替换表格中的指标记录，替换总表格数：%d,旧的指标id:%d，新的指标id:%d;%s", replaceTotal, oldEdbInfoId, newEdbInfoId, logMsg))
 			}
 		}
 		if errmsg != "" {
@@ -685,7 +685,7 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelL
 		}
 		//更新配置中的指标B
 		sql = `UPDATE excel_edb_mapping SET edb_info_id=?, modify_time=? WHERE excel_info_id=? and edb_info_id=?`
-		_, err = to.Raw(sql, newEdbInfo.EdbInfoId, time.Now(), excelInfo.ExcelInfoId, oldEdbInfo.EdbInfoId).Exec()
+		_, err = to.Raw(sql, newEdbInfoId, time.Now(), excelInfo.ExcelInfoId, oldEdbInfoId).Exec()
 		if err != nil {
 			errmsg = "更新指标B关联图表配置信息失败：Err:" + err.Error()
 			return
@@ -695,4 +695,3 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelL
 	}
 	return
 }
-*/

services/data/excel/excel_info.go

@@ -545,11 +545,12 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo) (err error)
 		}
 	}
 
-	/*err = excel.ReplaceEdbInExcel(oldEdbInfo, newEdbInfo, updateList)
+	err = excel.ReplaceEdbInExcel(oldEdbInfo.EdbInfoId, newEdbInfo.EdbInfoId, updateList)
 	if err != nil {
 		err = fmt.Errorf("替换表格中的指标失败，错误：%s", err.Error())
+		return
 	}
-	*/
+	
 	//todo 是否需要刷新表格中的指标数据
 	return
 }