xyxie 9 months ago
parent
commit
c2fcd7c684
2 changed files with 5 additions and 6 deletions
  1. 3 4
      models/data_manage/excel/excel_info.go
  2. 2 2
      services/data/excel/excel_info.go

+ 3 - 4
models/data_manage/excel/excel_info.go

@@ -1,12 +1,9 @@
 package excel
 
 import (
-	"eta/eta_api/models/data_manage"
-	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"strconv"
 	"time"
 )
 
@@ -650,6 +647,7 @@ func GetExcelBaseInfoByExcelInfoIdList(excelInfoIdList []int) (items []*ExcelBas
 	return
 }
 
+/*
 // ReplaceEdbInExcel 替换表格中的指标
 func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelList []*ExcelInfo) (err error) {
 	var errmsg string
@@ -673,7 +671,7 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelL
 			fmt.Println("errmsg:" + errmsg)
 		}
 		if err != nil && errmsg != "" {
-			go alarm_msg.SendAlarmMsg("替换替换配置中的指标记录失败提醒,errmsg:"+errmsg, 3)
+			//go alarm_msg.SendAlarmMsg("替换替换配置中的指标记录失败提醒,errmsg:"+errmsg, 3)
 		}
 	}()
 	// 替换表格中的内容
@@ -697,3 +695,4 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo, updateExcelL
 	}
 	return
 }
+*/

+ 2 - 2
services/data/excel/excel_info.go

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