[修改] 报告新增

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;
 }

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)) {

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()) {
+        for (ReportFile reportFile : reportEntity.getFileList()) {
-            ReportFile reportFile = new ReportFile();
             reportFile.setId(UUID.randomUUID().replace("-",""));
             reportFile.setReportId(reportId);
-            reportFile.setFileId(s);
+//            reportFile.setFileId(s);
             reportFile.setState(2);
             reportFiles.add(reportFile);
         }