From 1f2c158a69f690c642c39fc707716bed207e7ac6 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Wed, 24 May 2023 17:46:39 +0800
Subject: [PATCH 1/2] =?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<ReportDao, ReportEntity>
         if (reportFiles != null) {
             fileIds = reportFiles.stream().map(ReportFile::getFileId).collect(Collectors.toList());
         }
-        //TODO  FILE
-//        if (CollectionUtils.isNotEmpty(fileIds)) {
-//            List<FileEntity> fileEntities = fileDao.selectBatchIds(fileIds);
-//            List<FileVo> fileVos = BeanCopyUtils.copyBeanList(fileEntities, FileVo.class);
-//            reportDetailVo.setFileList(fileVos);
-//        }
+
+        if (CollectionUtils.isNotEmpty(fileIds)) {
+            List<FileEntity> fileEntities = fileDao.selectBatchIds(fileIds);
+            List<ReportFile> fileVos = BeanCopyUtils.copyBeanList(fileEntities, ReportFile.class);
+            reportDetailVo.setFileList(fileVos);
+        }
 
         //设置部门名称
         String department = reportDetailVo.getDepartment();

From 6349af539b3eaa7cf524d256ef5447749a14c101 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Wed, 24 May 2023 17:48:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ci:=E5=88=A0=E6=8E=89=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=AE=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReportManageConroller.java     | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
index 88676fd..ae62141 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
@@ -296,31 +296,6 @@ public class ReportManageConroller {
         return Result.success();
     }
 
-    // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉
-    /**
-     * 测试
-     */
-    @ApiOperation("testtest")
-    @GetMapping("/test")
-    @Deprecated
-    public void ttt() {
-        stringRedisTemplate.boundValueOps("1121212").set("1212");
-
-    }
-
-    // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉
-    @ApiOperation("testPath")
-    @GetMapping("/testPath")
-    @Deprecated
-    public ResponseMessage testPath() throws URISyntaxException {
-        HashMap<String, String> pathMap = new HashMap<>();
-        String jarPath = new File(getClass().getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getParentFile().getPath();
-        String property = System.getProperty("user.dir");
-        pathMap.put("jarpath", jarPath);
-        pathMap.put("propertyPath", property);
-        return Result.success(pathMap);
-    }
-
     /**
      * 获取文件名
      * @param fileId