fix

services/data/edb_info.go

@@ -267,14 +267,23 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr []*data_
 			case 0: //普通运算指标
 				calculateInfoArr = append(calculateInfoArr, tmpEdbInfo)
 			case 1: //预测运算指标
-				predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+				//predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+				if tmpEdbInfo.EdbType == 1 { //预测普通指标
+					basePredictEdbInfoArr = append(basePredictEdbInfoArr, tmpEdbInfo)
+				} else {
+					predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+				}
 			}
 		}
 		switch v.EdbInfoType {
 		case 0: //普通运算指标
 			calculateInfoArr = append(calculateInfoArr, v)
 		case 1: //预测运算指标
-			predictCalculateInfoArr = append(predictCalculateInfoArr, v)
+			if v.EdbType == 1 { //预测普通指标
+				basePredictEdbInfoArr = append(basePredictEdbInfoArr, v)
+			} else {
+				predictCalculateInfoArr = append(predictCalculateInfoArr, v)
+			}
 		}
 	}
 
@@ -292,7 +301,12 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr []*data_
 			case 0: //普通基础指标
 				baseEdbInfoArr = append(baseEdbInfoArr, tmpEdbInfo)
 			case 1: //预测基础指标
-				basePredictEdbInfoArr = append(basePredictEdbInfoArr, tmpEdbInfo)
+				if tmpEdbInfo.EdbType == 1 { //预测普通指标
+					basePredictEdbInfoArr = append(basePredictEdbInfoArr, tmpEdbInfo)
+				} else {
+					predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+				}
+				//basePredictEdbInfoArr = append(basePredictEdbInfoArr, tmpEdbInfo)
 			}
 		}
 
@@ -301,14 +315,23 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr []*data_
 			case 0: //普通运算指标
 				calculateInfoArr = append(calculateInfoArr, tmpEdbInfo)
 			case 1: //预测运算指标
-				predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+				if tmpEdbInfo.EdbType == 1 { //预测普通指标
+					basePredictEdbInfoArr = append(basePredictEdbInfoArr, tmpEdbInfo)
+				} else {
+					predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+				}
+				//predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
 			}
 		}
 		switch v.EdbInfoType {
 		case 0: //普通运算指标
 			calculateInfoArr = append(calculateInfoArr, v)
 		case 1: //预测运算指标
-			predictCalculateInfoArr = append(predictCalculateInfoArr, v)
+			if v.EdbType == 1 { //预测普通指标
+				basePredictEdbInfoArr = append(basePredictEdbInfoArr, v)
+			} else {
+				predictCalculateInfoArr = append(predictCalculateInfoArr, v)
+			}
 		}
 	}
 
@@ -372,14 +395,22 @@ func getRefreshEdbInfoListByIds(edbInfoIdList []int) (newBaseEdbInfoArr []*data_
 				case 0: //普通运算指标
 					calculateInfoArr = append(calculateInfoArr, tmpEdbInfo)
 				case 1: //预测运算指标
-					predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+					if tmpEdbInfo.EdbType == 1 { //预测普通指标
+						basePredictEdbInfoArr = append(basePredictEdbInfoArr, tmpEdbInfo)
+					} else {
+						predictCalculateInfoArr = append(predictCalculateInfoArr, tmpEdbInfo)
+					}
 				}
 			}
 			switch v.EdbInfoType {
 			case 0: //普通运算指标
 				calculateInfoArr = append(calculateInfoArr, v)
 			case 1: //预测运算指标
-				predictCalculateInfoArr = append(predictCalculateInfoArr, v)
+				if v.EdbType == 1 { //预测普通指标
+					basePredictEdbInfoArr = append(basePredictEdbInfoArr, v)
+				} else {
+					predictCalculateInfoArr = append(predictCalculateInfoArr, v)
+				}
 			}
 		}