Browse Source

被引用指标可以停用

kobe6258 1 month ago
parent
commit
81ed95e644
2 changed files with 19 additions and 12 deletions
  1. 11 10
      controllers/data_manage/edb_info.go
  2. 8 2
      controllers/data_manage/edb_info_refresh.go

+ 11 - 10
controllers/data_manage/edb_info.go

@@ -5682,16 +5682,17 @@ func (this *EdbInfoController) EdbChartList() {
 						v.IsSupplierStop = 1
 					}
 				}
-				var relation *data_manage.BaseRelationEdbInfo
-				relation, err = data.GetEdbRelationListById(v.EdbInfoId, v.Source)
-				if err != nil && !utils.IsErrNoRow(err) {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取数据引用信息失败,Err:" + e.Error()
-					return
-				}
-				if relation != nil && relation.RelationNum > 0 {
-					v.IsRelation = true
-				}
+				//优化需求340 被引用的指标可以被停用
+				//var relation *data_manage.BaseRelationEdbInfo
+				//relation, err = data.GetEdbRelationListById(v.EdbInfoId, v.Source)
+				//if err != nil && !utils.IsErrNoRow(err) {
+				//	br.Msg = "获取失败"
+				//	br.ErrMsg = "获取数据引用信息失败,Err:" + e.Error()
+				//	return
+				//}
+				//if relation != nil && relation.RelationNum > 0 {
+				//	v.IsRelation = true
+				//}
 			}
 		}
 		page = paging.GetPaging(currentIndex, pageSize, int(dataCount))

+ 8 - 2
controllers/data_manage/edb_info_refresh.go

@@ -716,7 +716,9 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			if ok {
 				continue
 			}
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
+			//优化需求340 被引用指标也可以停用
+			//if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
+			if v.IsSupplierStop == 0 && isStop == 1 {
 				br.Msg = "保存失败,停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.ErrMsg = "保存失败,停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				return
@@ -733,7 +735,11 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			return
 		}
 		for _, v := range edbRelationList {
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
+			//优化需求340 被引用指标也可以停用
+			//if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
+			if v.IsSupplierStop == 0 && isStop == 1 {
+				//br.Msg = "保存失败,停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
+				//br.ErrMsg = "保存失败,停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.Msg = "保存失败,停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.ErrMsg = "保存失败,停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				return