From dc2a8b69fee3cd3631500088ecaf545357c40fda Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 25 May 2023 10:44:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=A4=9A=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=E8=AF=A6=E6=83=85=E9=A2=84?= =?UTF-8?q?=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/report/service/impl/IReportServiceImpl.java | 2 ++ .../resources/mybatis/mapper/mysql/ReportManageMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) 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 ee0a49c..67238fb 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 @@ -156,8 +156,10 @@ public class IReportServiceImpl extends ServiceImpl List reportFiles = new ArrayList<>(); for (String s : reportEntity.getFileList()) { ReportFile reportFile = new ReportFile(); + reportFile.setId(UUID.randomUUID().replace("-","")); reportFile.setReportId(reportId); reportFile.setFileId(s); + reportFile.setState(2); reportFiles.add(reportFile); } iReportFileService.saveBatch(reportFiles); diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index f0dde0a..f7efaeb 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -334,11 +334,11 @@ rm.confidentialLevel AS confidentialLevel, rm.privacyLevel AS privacyLevel, rm.secrecy_last AS secrecyLast, - f.id as fileId, f.file_name as fileName ,rf.id as rfId + f.FILE_ID as fileId, f.file_name as fileName ,rf.id as rfId FROM `tt_report_manage` AS rm LEFT JOIN ts_user AS u ON u.USID = rm.createUserId LEFT JOIN ts_org as org on org.id = rm.department - LEFT JOIN ts_report_file rf on rf.report_id = rm.id on rf.state = 2 + LEFT JOIN ts_report_file rf on rf.report_id = rm.id and rf.state = 2 LEFT JOIN ts_file f on f.FILE_ID = rf.file_id WHERE rm.id = #{reportId} AND rm.del_flag = 0