Merge branch 'eta_2.6.1_forecast_year_on_year_diff' into debug

logic/predict_edb.go

@@ -422,7 +422,6 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 			edbInfoList = append(edbInfoList, fromEdbInfo)
 
 			//总的 预测指标与所有相关联指标的关系表（不仅仅该条规则）
-			fromEdbMap[edbInfoId] = edbInfoId
 			calculateMappingItem = &models.EdbInfoCalculateMapping{
 				EdbInfoCalculateMappingId: 0,
 				EdbInfoId:                 0,

models/predict_edb_data_base.go

@@ -114,7 +114,22 @@ func AddPredictEdb(item *EdbInfo, calculateMappingList []*EdbInfoCalculateMappin
 					return
 				}
 			}
-
+		case 17, 18: //14：根据 一元线性拟合 规则获取预测数据
+			calculateRule := calculateRuleMap[k]
+			calculateRule.ConfigId = v.ConfigId
+			calculateRule.EdbInfoId = v.PredictEdbInfoId
+			// 规则与指标的关系入库
+			lenTrendsCalculateMapping := len(calculateRule.TrendsCalculateMappingList)
+			if lenTrendsCalculateMapping > 0 {
+				for _, vv := range calculateRule.TrendsCalculateMappingList {
+					vv.EdbInfoId = item.EdbInfoId
+					vv.ConfigId = v.ConfigId
+				}
+				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, utils.MultiAddNum).Error
+				if err != nil {
+					return
+				}
+			}
 		}
 
 		// 规则配置（含数据）