From 5d392877cf1e439780ccdefc03b9bac391c836c9 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Thu, 25 May 2023 11:12:43 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/report/eo/ReportEntity.java     | 2 +-
 .../da/report/service/impl/IReportContentServiceImpl.java    | 1 +
 .../com/adc/da/report/service/impl/IReportServiceImpl.java   | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java
index f444238..8dea718 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java
@@ -111,5 +111,5 @@ public class ReportEntity {
     private List<List<String>> labelList;
 
     @TableField(exist = false)
-    private List<String> fileList;
+    private List<ReportFile> fileList;
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
index c77fbfd..3fde68d 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportContentServiceImpl.java
@@ -65,6 +65,7 @@ public class IReportContentServiceImpl extends ServiceImpl<ReportContentDao, Rep
     public void insertReportContent(String reportId) throws IOException {
         LambdaQueryWrapper<ReportFile> reportFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
         reportFileLambdaQueryWrapper.eq(ReportFile::getReportId, reportId);
+        reportFileLambdaQueryWrapper.eq(ReportFile::getState, 2);
         List<ReportFile> reportFiles = reportFileDao.selectList(reportFileLambdaQueryWrapper);
         List<String> fileIds = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(reportFiles)) {
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
index d7c8575..527fd78 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
@@ -154,11 +154,10 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
         //文件
         reportFileDao.delByReportId(new ReportFile(reportId,2));
         List<ReportFile> reportFiles = new ArrayList<>();
-        for (String s : reportEntity.getFileList()) {
-            ReportFile reportFile = new ReportFile();
+        for (ReportFile reportFile : reportEntity.getFileList()) {
             reportFile.setId(UUID.randomUUID().replace("-",""));
             reportFile.setReportId(reportId);
-            reportFile.setFileId(s);
+//            reportFile.setFileId(s);
             reportFile.setState(2);
             reportFiles.add(reportFile);
         }