xyxie 9 months ago
parent
commit
deb6d6a3c7
3 changed files with 17 additions and 3 deletions
  1. 4 2
      services/data/edb_classify.go
  2. 7 1
      services/data/excel/excel_info.go
  3. 6 0
      services/sandbox/sandbox.go

+ 4 - 2
services/data/edb_classify.go

@@ -571,7 +571,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 				return
 			}
 			if predictEdbInfoCount > 0 {
-				deleteStatus = 3
+				deleteStatus = 5
 				tipsMsg = "当前指标已用作预测指标,不可删除"
 				return
 			}
@@ -591,7 +591,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 			//3、删除失败:Deletion failed
 			//4、知道了:Understood
 			if len(excelIds) > 0 {
-				deleteStatus = 3
+				deleteStatus = 6
 				tipsMsg = "当前指标已被表格引用,不可删除"
 				tableList, tmpErr = excel.GetExcelBaseInfoByExcelInfoIdList(excelIds)
 				if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
@@ -614,6 +614,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 				return
 			}
 			if len(tagXList) > 0 {
+				deleteStatus = 7
 				errMsg = "当前指标已添加到跨品种分析,不可删除"
 				return
 			}
@@ -625,6 +626,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 			}
 
 			if len(tagYList) > 0 {
+				deleteStatus = 7
 				errMsg = "当前指标已添加到跨品种分析,不可删除"
 				return
 			}

+ 7 - 1
services/data/excel/excel_info.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/data_manage/excel/request"
 	"eta/eta_api/models/data_manage/excel/response"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/services/data"
 	"eta/eta_api/services/data/data_manage_permission"
 	"eta/eta_api/utils"
@@ -502,6 +503,11 @@ func GetExcelEdbBatchRefreshKey(source string, reportId, chapterId int) string {
 
 // ReplaceEdbInExcel 替换表格中的指标
 func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo) (err error) {
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("替换表格中的指标失败提醒,errmsg:"+err.Error(), 3)
+		}
+	}()
 	//查询和指标相关的 表格
 	mappingList, err := excel.GetExcelEdbMappingByEdbInfoId(oldEdbInfo.EdbInfoId)
 	if err != nil {
@@ -550,7 +556,7 @@ func ReplaceEdbInExcel(oldEdbInfo, newEdbInfo *data_manage.EdbInfo) (err error)
 		err = fmt.Errorf("替换表格中的指标失败,错误:%s", err.Error())
 		return
 	}
-	
+
 	//todo 是否需要刷新表格中的指标数据
 	return
 }

+ 6 - 0
services/sandbox/sandbox.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/models/sandbox"
 	"eta/eta_api/models/sandbox/request"
 	"eta/eta_api/models/system"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"fmt"
 	"strconv"
@@ -856,6 +857,11 @@ func sandboxClassifyHaveChildV2(allNode []*sandbox.SandboxClassifyItems, node *s
 
 func ReplaceEdbInSandbox(oldEdbInfoId, newEdbInfoId int) (err error) {
 	//分页处理沙盘表
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("替换沙盘中的指标记录失败提醒,errmsg:"+err.Error(), 3)
+		}
+	}()
 	//查询沙盘总数
 	total, err := sandbox.GetSandboxListCountByCondition("", []interface{}{})
 	if err != nil {