Merge remote-tracking branch 'origin/lixuetao' into lixuetao

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

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)) {
+        if (CollectionUtils.isNotEmpty(fileIds)) {
-//            List<FileEntity> fileEntities = fileDao.selectBatchIds(fileIds);
+            List<FileEntity> fileEntities = fileDao.selectBatchIds(fileIds);
-//            List<FileVo> fileVos = BeanCopyUtils.copyBeanList(fileEntities, FileVo.class);
+            List<ReportFile> fileVos = BeanCopyUtils.copyBeanList(fileEntities, ReportFile.class);
-//            reportDetailVo.setFileList(fileVos);
+            reportDetailVo.setFileList(fileVos);
-//        }
+        }
 
         //设置部门名称
         String department = reportDetailVo.getDepartment();