From c07d4b29dacd8480ed76d7367583e4883cea64da Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 17 Aug 2022 15:12:16 +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

---
 .../main/java/com/epmet/dto/result/ReportResultDTO.java  | 3 +++
 .../epmet/service/impl/IcCustomerReportServiceImpl.java  | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java
index b8638c3b5c..2701957317 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ReportResultDTO.java
@@ -27,6 +27,8 @@ public class ReportResultDTO implements Serializable {
      */
     private String reportId;
 
+    private Boolean isList;
+
     /**
      * 客户ID
      */
@@ -86,6 +88,7 @@ public class ReportResultDTO implements Serializable {
     public ReportResultDTO() {
         this.reportName = "";
         this.reportId = "";
+        this.isList = false;
         this.customerList = new ArrayList<>();
     }
 }
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 59e2a836a7..4b6a79619b 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
@@ -124,6 +124,15 @@ 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);