From 32225e30baee900528fcd1067ae9bd98edaa0ca0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 17 Aug 2022 17:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AAisList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dtos/result/JiMuReportResultDTO.java       |  2 ++
 .../impl/IcCustomerReportServiceImpl.java      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportResultDTO.java b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportResultDTO.java
index 9f48ab6bba..6ef587b6d5 100644
--- a/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportResultDTO.java
+++ b/epmet-commons/epmet-commons-feignclient/src/main/java/com/epmet/commons/feignclient/dtos/result/JiMuReportResultDTO.java
@@ -21,4 +21,6 @@ public class JiMuReportResultDTO implements Serializable {
     private String id;
     private String reportId;
     private String reportName;
+
+    private Boolean isList = false;
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java
index 04e1b596b4..f77a9741bc 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcCustomerReportServiceImpl.java
@@ -130,15 +130,6 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
             ReportResultDTO dto = new ReportResultDTO();
             dto.setReportId(r.getId());
             dto.setReportName(r.getName());
-            JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r.getId());
-            if (!reportDbDataResultDTOJiMuResult.isSuccess()){
-                throw new EpmetException("获取报表dbData失败："+r.getId());
-            }
-            log.info(JSON.toJSONString(reportDbDataResultDTOJiMuResult));
-            JimuReportDbDataResultDTO.ReportDB reportDb = reportDbDataResultDTOJiMuResult.getResult().getReportDb();
-            if (null != reportDb){
-                dto.setIsList(reportDb.getIsList().equals(NumConstant.ONE_STR));
-            }
             allReportList.add(dto);
         });
         List<ReportResultDTO> reportList = baseDao.reportList(null, null);
@@ -254,6 +245,15 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor
                 throw new EpmetException("获取jm报表详情失败：" + r);
             }
             JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class);
+            JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r);
+            if (!reportDbDataResultDTOJiMuResult.isSuccess()){
+                throw new EpmetException("获取报表dbData失败："+r);
+            }
+            log.info(JSON.toJSONString(reportDbDataResultDTOJiMuResult));
+            JimuReportDbDataResultDTO.ReportDB reportDb = reportDbDataResultDTOJiMuResult.getResult().getReportDb();
+            if (null != reportDb){
+                data.setIsList(reportDb.getIsList().equals(NumConstant.ONE_STR));
+            }
             data.setReportId(data.getId());
             data.setReportName(data.getName());
             result.add(data);