Sfoglia il codice sorgente

fix:指标名称

Roc 2 anni fa
parent
commit
c93740e7c1
2 ha cambiato i file con 8 aggiunte e 1 eliminazioni
  1. 2 1
      controllers/base_from_python.go
  2. 6 0
      models/base_from_python.go

+ 2 - 1
controllers/base_from_python.go

@@ -360,10 +360,11 @@ func (this *PythonController) Edit() {
 		}
 	}
 	edbInfo.EdbName = utils.TrimStr(req.EdbName)
+	edbInfo.EdbNameSource = utils.TrimStr(req.EdbName)
 	edbInfo.Unit = req.Unit
 	edbInfo.ClassifyId = req.ClassifyId
 	edbInfo.Frequency = req.Frequency
-	err = edbInfo.Update([]string{"EdbName", "Unit", "ClassifyId", "Frequency"})
+	err = edbInfo.Update([]string{"EdbName", "EdbNameSource", "Unit", "ClassifyId", "Frequency"})
 	if err != nil {
 		br.Msg = "修改python运算指标失败"
 		br.Msg = "修改python运算指标失败,ModifyEdbInfo Err:" + err.Error()

+ 6 - 0
models/base_from_python.go

@@ -263,14 +263,20 @@ func EditEdbInfoCalculateMapping(edbInfoId int, edbCode string, edbInfoList []*E
 		return
 	}
 	existEdbInfoIdMap := make(map[int]int)
+	isOpEdbInfoIdMap := make(map[int]int)
 	for _, v := range existList {
 		existEdbInfoIdMap[v.FromEdbInfoId] = v.FromEdbInfoId
 	}
 	//添加指标关系
 	for _, tmpEdbInfo := range edbInfoList {
+		//如果该指标id已经处理过了,那么就不处理了
+		if _, ok := isOpEdbInfoIdMap[tmpEdbInfo.EdbInfoId]; ok {
+			continue
+		}
 		if _, ok := existEdbInfoIdMap[tmpEdbInfo.EdbInfoId]; ok {
 			//如果存在,那么就移除map里面的东西
 			delete(existEdbInfoIdMap, tmpEdbInfo.EdbInfoId)
+			isOpEdbInfoIdMap[tmpEdbInfo.EdbInfoId] = tmpEdbInfo.EdbInfoId
 		} else {
 			calculateMappingItem := new(EdbInfoCalculateMapping)
 			calculateMappingItem.CreateTime = time.Now()