Merge branch 'chart/13.4' into debug

models/predict_edb_conf.go

@@ -171,6 +171,7 @@ func AddPredictEdb(item *EdbInfo, calculateMappingList []*EdbInfoCalculateMappin
 	if lenCalculateMapping > 0 {
 		for _, calculateMappingItem := range calculateMappingList {
 			calculateMappingItem.EdbInfoId = item.EdbInfoId
+			calculateMappingItem.EdbCode = item.EdbCode
 		}
 		_, err = tx.InsertMulti(lenCalculateMapping, calculateMappingList)
 		if err != nil {
@@ -314,6 +315,10 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 	// 新增预测指标的关联关系
 	lenCalculateMapping := len(calculateMappingList)
 	if lenCalculateMapping > 0 {
+		for _, calculateMappingItem := range calculateMappingList {
+			calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+			calculateMappingItem.EdbCode = edbInfo.EdbCode
+		}
 		_, err = tx.InsertMulti(lenCalculateMapping, calculateMappingList)
 		if err != nil {
 			return
@@ -350,6 +355,7 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 			lenTrendsCalculateMapping := len(calculateRule.TrendsCalculateMappingList)
 			if lenTrendsCalculateMapping > 0 {
 				for _, vv := range calculateRule.TrendsCalculateMappingList {
+					vv.EdbInfoId = edbInfo.EdbInfoId
 					vv.ConfigId = v.ConfigId
 				}
 				_, err = tx.InsertMulti(lenTrendsCalculateMapping, calculateRule.TrendsCalculateMappingList)
@@ -372,6 +378,7 @@ func EditPredictEdb(edbInfo *EdbInfo, updateEdbInfoCol []string, calculateMappin
 			lenTrendsCalculateMapping := len(calculateRule.TrendsCalculateMappingList)
 			if lenTrendsCalculateMapping > 0 {
 				for _, vv := range calculateRule.TrendsCalculateMappingList {
+					vv.EdbInfoId = edbInfo.EdbInfoId
 					vv.ConfigId = v.ConfigId
 				}
 				_, err = tx.InsertMulti(lenTrendsCalculateMapping, calculateRule.TrendsCalculateMappingList)