过滤预测指标

services/data/edb_info_relation.go

@@ -35,12 +35,18 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
 	refreshIds := make([]int, 0)
 	indexCodeList := make([]string, 0)
 	// 查询指标信息
-	edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
+	edbInfoListTmp, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 	if e != nil {
 		err = fmt.Errorf("查询指标信息失败，%s", e.Error())
 		return
 	}
-
+	// 过滤预测指标
+	edbInfoList := make([]*data_manage.EdbInfo, 0)
+	for _, v := range edbInfoListTmp {
+		if v.EdbInfoType == 0 {
+			edbInfoList = append(edbInfoList, v)
+		}
+	}
 	// 查询计算指标信息，并且建立关联关系
 	// 查询间接引用的指标信息
 	calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
@@ -234,12 +240,18 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
 	}
 
 	// 查询指标信息
-	edbInfoList, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
+	edbInfoListTmp, e := data_manage.GetEdbInfoByIdList(edbInfoIds)
 	if e != nil {
 		err = fmt.Errorf("查询指标信息失败，%s", e.Error())
 		return
 	}
-
+	// 过滤预测指标
+	edbInfoList := make([]*data_manage.EdbInfo, 0)
+	for _, v := range edbInfoListTmp {
+		if v.EdbInfoType == 0 {
+			edbInfoList = append(edbInfoList, v)
+		}
+	}
 	// 查询计算指标信息，并且建立关联关系
 	// 查询间接引用的指标信息
 	calculateEdbMappingListMap, calculateEdbMappingIdsMap, e := GetEdbListByEdbInfoId(edbInfoList)
@@ -277,7 +289,6 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
 		_, ok1 := relationMap[matter.FeCalendarMatterId]
 		edbInfo, ok2 := addEdbInfoIdMap[matter.EdbInfoId]
 		if !ok1 && ok2 {
-
 			tmp := &data_manage.EdbInfoRelation{
 				ReferObjectId:      matter.FeCalendarMatterId,
 				ReferObjectType:    utils.EDB_RELATION_CALENDAR,