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> labelList; @TableField(exist = false) - private List fileList; + private List 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 reportFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); reportFileLambdaQueryWrapper.eq(ReportFile::getReportId, reportId); + reportFileLambdaQueryWrapper.eq(ReportFile::getState, 2); List reportFiles = reportFileDao.selectList(reportFileLambdaQueryWrapper); List 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 //文件 reportFileDao.delByReportId(new ReportFile(reportId,2)); List 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); }