Merge branch 'eta_2.6.1_forecast_year_on_year_diff' into debug

logic/predict_edb.go

@@ -398,6 +398,8 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 		case 17, 18:
 			//关联的指标信息
 			edbInfoList := make([]*models.EdbInfo, 0)
+			// 动态环差规则 关系表
+			trendsMappingList := make([]*models.PredictEdbConfCalculateMapping, 0)
 			edbInfoId, parseErr := strconv.Atoi(v.Value)
 			if parseErr != nil {
 				errMsg = "请填写正确的指标id"
@@ -437,12 +439,29 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 				CreateTime: time.Now(),
 				ModifyTime: time.Now(),
 			}
+
 			calculateMappingList = append(calculateMappingList, calculateMappingItem)
+			// 动态同比同差规则 关系表
+			tmpPredictEdbConfCalculateMapping := &models.PredictEdbConfCalculateMapping{
+				//PredictEdbConfCalculateMappingId: 0,
+				EdbInfoId:      0,
+				ConfigId:       0,
+				FromEdbInfoId:  fromEdbInfo.EdbInfoId,
+				FromEdbCode:    fromEdbInfo.EdbCode,
+				FromEdbName:    fromEdbInfo.EdbName,
+				FromSource:     fromEdbInfo.Source,
+				FromSourceName: fromEdbInfo.SourceName,
+				Sort:           1,
+				CreateTime:     time.Now(),
+				ModifyTime:     time.Now(),
+			}
+			trendsMappingList = append(trendsMappingList, tmpPredictEdbConfCalculateMapping)
 			calculateRuleMap[ruleIndex] = models.CalculateRule{
-				EdbInfoList:  edbInfoList,
-				RuleType:     v.RuleType,
-				EndDate:      v.EndDate,
-				EdbInfoIdArr: v.EdbInfoIdArr,
+				TrendsCalculateMappingList: trendsMappingList,
+				EdbInfoList:                edbInfoList,
+				RuleType:                   v.RuleType,
+				EndDate:                    v.EndDate,
+				EdbInfoIdArr:               v.EdbInfoIdArr,
 			}
 		}
 
@@ -853,17 +872,19 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 		case 17, 18:
 			//关联的指标信息
 			edbInfoList := make([]*models.EdbInfo, 0)
-			edbInfoId, parseErr := strconv.Atoi(v.Value)
+			// 动态 关系表
+			trendsMappingList := make([]*models.PredictEdbConfCalculateMapping, 0)
+			relateEdbInfoId, parseErr := strconv.Atoi(v.Value)
 			if parseErr != nil {
 				errMsg = "请填写正确的指标id"
 				err = errors.New(errMsg)
 				return
 			}
-			fromEdbInfo, tmpErr := models.GetEdbInfoById(edbInfoId)
+			fromEdbInfo, tmpErr := models.GetEdbInfoById(relateEdbInfoId)
 			if tmpErr != nil {
 				err = tmpErr
 				if err.Error() == utils.ErrNoRow() {
-					errMsg = "指标 " + strconv.Itoa(edbInfoId) + " 不存在"
+					errMsg = "指标 " + strconv.Itoa(relateEdbInfoId) + " 不存在"
 					err = errors.New(errMsg)
 					return
 				}
@@ -875,7 +896,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 			edbInfoList = append(edbInfoList, fromEdbInfo)
 
 			//总的 预测指标与所有相关联指标的关系表（不仅仅该条规则）
-			fromEdbMap[edbInfoId] = edbInfoId
+			fromEdbMap[relateEdbInfoId] = relateEdbInfoId
 			calculateMappingItem = &models.EdbInfoCalculateMapping{
 				EdbInfoCalculateMappingId: 0,
 				EdbInfoId:                 0,
@@ -893,11 +914,27 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 				ModifyTime: time.Now(),
 			}
 			calculateMappingList = append(calculateMappingList, calculateMappingItem)
+			// 动态同比同差规则 关系表
+			tmpPredictEdbConfCalculateMapping := &models.PredictEdbConfCalculateMapping{
+				//PredictEdbConfCalculateMappingId: 0,
+				EdbInfoId:      0,
+				ConfigId:       0,
+				FromEdbInfoId:  fromEdbInfo.EdbInfoId,
+				FromEdbCode:    fromEdbInfo.EdbCode,
+				FromEdbName:    fromEdbInfo.EdbName,
+				FromSource:     fromEdbInfo.Source,
+				FromSourceName: fromEdbInfo.SourceName,
+				Sort:           1,
+				CreateTime:     time.Now(),
+				ModifyTime:     time.Now(),
+			}
+			trendsMappingList = append(trendsMappingList, tmpPredictEdbConfCalculateMapping)
 			calculateRuleMap[ruleIndex] = models.CalculateRule{
-				EdbInfoList:  edbInfoList,
-				RuleType:     v.RuleType,
-				EndDate:      v.EndDate,
-				EdbInfoIdArr: v.EdbInfoIdArr,
+				TrendsCalculateMappingList: trendsMappingList,
+				EdbInfoList:                edbInfoList,
+				RuleType:                   v.RuleType,
+				EndDate:                    v.EndDate,
+				EdbInfoIdArr:               v.EdbInfoIdArr,
 			}
 		}