Merge branch 'eta_2.6.1_forecast_year_on_year_diff' into debug

models/predict_edb_data_base.go

@@ -277,8 +277,24 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 				if err != nil {
 					return
 				}
-			}
 
+			}
+		case 17, 18: //14：根据 一元线性拟合 规则获取预测数据
+			calculateRule := calculateRuleMap[confIndex]
+			calculateRule.ConfigId = v.ConfigId
+			calculateRule.EdbInfoId = v.PredictEdbInfoId
+			// 规则与指标的关系入库
+			lenTrendsCalculateMapping := len(calculateRule.TrendsCalculateMappingList)
+			if lenTrendsCalculateMapping > 0 {
+				for _, vv := range calculateRule.TrendsCalculateMappingList {
+					vv.EdbInfoId = edbInfo.EdbInfoId
+					vv.ConfigId = v.ConfigId
+				}
+				err = to.CreateInBatches(calculateRule.TrendsCalculateMappingList, utils.MultiAddNum).Error
+				if err != nil {
+					return
+				}
+			}
 		}
 
 		calculateRuleIndex++