增加计算指标列表

logic/predict_edb.go

@@ -850,7 +850,55 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 				EndDate:      v.EndDate,
 				EdbInfoIdArr: v.EdbInfoIdArr,
 			}
+		case 17, 18:
+			//关联的指标信息
+			edbInfoList := make([]*models.EdbInfo, 0)
+			edbInfoId, parseErr := strconv.Atoi(v.Value)
+			if parseErr != nil {
+				errMsg = "请填写正确的指标id"
+				err = errors.New(errMsg)
+				return
+			}
+			fromEdbInfo, tmpErr := models.GetEdbInfoById(edbInfoId)
+			if tmpErr != nil {
+				err = tmpErr
+				if err.Error() == utils.ErrNoRow() {
+					errMsg = "指标 " + strconv.Itoa(edbInfoId) + " 不存在"
+					err = errors.New(errMsg)
+					return
+				}
+				errMsg = "获取指标失败:Err:" + err.Error()
+				err = errors.New(errMsg)
+				return
+			}
 
+			edbInfoList = append(edbInfoList, fromEdbInfo)
+
+			//总的 预测指标与所有相关联指标的关系表（不仅仅该条规则）
+			fromEdbMap[edbInfoId] = edbInfoId
+			calculateMappingItem = &models.EdbInfoCalculateMapping{
+				EdbInfoCalculateMappingId: 0,
+				EdbInfoId:                 0,
+				Source:                    edbInfo.Source,
+				SourceName:                edbInfo.SourceName,
+				EdbCode:                   "",
+				FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+				FromEdbCode:               fromEdbInfo.EdbCode,
+				FromEdbName:               fromEdbInfo.EdbName,
+				FromSource:                fromEdbInfo.Source,
+				FromSourceName:            fromEdbInfo.SourceName,
+				//FromTag:                   tmpEdbInfoId.FromTag,
+				Sort:       1,
+				CreateTime: time.Now(),
+				ModifyTime: time.Now(),
+			}
+			calculateMappingList = append(calculateMappingList, calculateMappingItem)
+			calculateRuleMap[ruleIndex] = models.CalculateRule{
+				EdbInfoList:  edbInfoList,
+				RuleType:     v.RuleType,
+				EndDate:      v.EndDate,
+				EdbInfoIdArr: v.EdbInfoIdArr,
+			}
 		}
 
 		tmpPredictEdbConf := &models.PredictEdbConf{