修改批量下载接口

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtQuarterlyReportServiceImpl.java

@@ -81,7 +81,10 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
         List<V> quarterlyReportVOList = this.findRecursion(query).getContent();
         if (!ObjectUtils.isEmpty(quarterlyReportVOList)) {
             ExtQuarterlyReportVO extQuarterlyReportVO = quarterlyReportVOList.get(0);
-            this.extFindFileIds(fileIds, extQuarterlyReportVO.getObjFileLinks(), Constants.MASTER_FILE);
+            //取出所有行动项的附件id
+            for(ExtActionItemVO extActionItemVO:extQuarterlyReportVO.getExtActionItems()){
+                this.extFindFileIds(fileIds, extActionItemVO.getObjFileLinks(), Constants.MASTER_FILE);
+            }
             if (!CollectionUtils.isEmpty(fileIds)) {
                 fileIds.stream().forEach(fileId -> {
                     try {
@@ -94,7 +97,8 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
                 });
                 //压缩文件
                 downloadDataZip(response, tempDir);
-                // todo 删除临时文件夹
+                //删除生成后的临时文件
+                FileUtils.deleteDirectory(tempDir);
             } else {
                 throw new DxBusinessException("-1", "根据季报id：" + id + "未查到报表数据");
             }
@@ -154,11 +158,8 @@ public class ExtQuarterlyReportServiceImpl<V extends ExtQuarterlyReportVO> imple
      */
     private void extFindFileIds(List<Long> fileIds, List<ObjFileLinkVO> objFileLinks, String fileType) {
         if (!CollectionUtils.isEmpty(objFileLinks)) {
-            //遍历取主内容的文件id
-            List<ObjFileLinkVO> objFileLinkVOs = objFileLinks.stream().filter(n -> n.getContentType().equals(fileType)).collect(Collectors.toList());
-            objFileLinkVOs.stream().forEach(o -> {
-                fileIds.add(o.getTargetId());
-            });
+            //遍历取文件id
+            objFileLinks.stream().forEach(o -> {fileIds.add(o.getTargetId());});
         }
     }
 }