From 1f2c158a69f690c642c39fc707716bed207e7ac6 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Wed, 24 May 2023 17:46:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=20=E9=A2=84=E8=A7=88-?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/service/impl/IReportServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 6515a44..08ad463 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 @@ -23,6 +23,7 @@ import com.adc.da.sys.entity.RoleEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.MenuEOService; import com.adc.da.sys.service.OrgEOService; +import com.adc.da.sys.util.BeanCopyUtils; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.CollectionUtils; @@ -745,12 +746,12 @@ public class IReportServiceImpl extends ServiceImpl if (reportFiles != null) { fileIds = reportFiles.stream().map(ReportFile::getFileId).collect(Collectors.toList()); } - //TODO FILE -// if (CollectionUtils.isNotEmpty(fileIds)) { -// List fileEntities = fileDao.selectBatchIds(fileIds); -// List fileVos = BeanCopyUtils.copyBeanList(fileEntities, FileVo.class); -// reportDetailVo.setFileList(fileVos); -// } + + if (CollectionUtils.isNotEmpty(fileIds)) { + List fileEntities = fileDao.selectBatchIds(fileIds); + List fileVos = BeanCopyUtils.copyBeanList(fileEntities, ReportFile.class); + reportDetailVo.setFileList(fileVos); + } //设置部门名称 String department = reportDetailVo.getDepartment();