..

services/data/range_analysis/chart_info.go

@@ -504,20 +504,13 @@ func GetChartDataByEdbInfoList(chartInfoId int, dateType, startYear int, startDa
 	dataResp = data_manage.ChartRangeAnalysisDataResp{ChartRangeAnalysisExtraConf: req}
 	if req.MultipleGraphConfigId > 0 {
 		//判断MultipleGraphConfigId和图表关系是否正确
-		chartMappingList, e := data_manage.GetMultipleGraphConfigChartMappingListById(req.MultipleGraphConfigId)
+		multipleGraphConfigEdbMappingList, e := data_manage.GetMultipleGraphConfigEdbMappingListByIdAndSource(req.MultipleGraphConfigId, utils.CHART_SOURCE_RANGE_ANALYSIS)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = fmt.Errorf("获取区间计算图表, 指标信息失败, Err:" + e.Error())
 			return
 		}
-		if len(chartMappingList) > 0 {
-			multipleGraphConfigEdbMappingList, e := data_manage.GetMultipleGraphConfigEdbMappingListByIdAndSource(req.MultipleGraphConfigId, utils.CHART_SOURCE_RANGE_ANALYSIS)
-			if e != nil && e.Error() != utils.ErrNoRow() {
-				err = fmt.Errorf("获取区间计算图表, 指标信息失败, Err:" + e.Error())
-				return
-			}
-			// 查询是否已经生成指标
-			dataResp.ConfigEdbNum = len(multipleGraphConfigEdbMappingList)
-		}
+		// 查询是否已经生成指标
+		dataResp.ConfigEdbNum = len(multipleGraphConfigEdbMappingList)
 	}
 	edbList, err = GetChartEdbInfoFormat(chartInfoId, edbInfoMappingList)
 	if err != nil {
@@ -636,21 +629,13 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
 	dataResp = data_manage.ChartRangeAnalysisDataResp{ChartRangeAnalysisExtraConf: req, SeriesId: seriesMappingItem.FactorEdbSeriesId}
 	// 查询配置关联关系
 	if req.MultipleGraphConfigId > 0 {
-		//判断MultipleGraphConfigId和图表关系是否正确
-		chartMappingList, e := data_manage.GetMultipleGraphConfigChartMappingListById(req.MultipleGraphConfigId)
+		multipleGraphConfigEdbMappingList, e := data_manage.GetMultipleGraphConfigEdbMappingListByIdAndSource(req.MultipleGraphConfigId, utils.CHART_SOURCE_RANGE_ANALYSIS)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = fmt.Errorf("获取区间计算图表, 指标信息失败, Err:" + e.Error())
 			return
 		}
-		if len(chartMappingList) > 0 {
-			multipleGraphConfigEdbMappingList, e := data_manage.GetMultipleGraphConfigEdbMappingListByIdAndSource(req.MultipleGraphConfigId, utils.CHART_SOURCE_RANGE_ANALYSIS)
-			if e != nil && e.Error() != utils.ErrNoRow() {
-				err = fmt.Errorf("获取区间计算图表, 指标信息失败, Err:" + e.Error())
-				return
-			}
-			// 查询是否已经生成指标
-			dataResp.ConfigEdbNum = len(multipleGraphConfigEdbMappingList)
-		}
+		// 查询是否已经生成指标
+		dataResp.ConfigEdbNum = len(multipleGraphConfigEdbMappingList)
 	}
 
 	edbList, err = GetChartEdbInfoFormat(chartInfoId, edbInfoMappingList)