7/25 被无效历史文件顺序修改

src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.dto.business.InvalidRecordDTO;
+import cn.cslg.pas.common.dto.invalidDTO.QueryReportAffairDTO;
 import cn.cslg.pas.common.model.cronModel.Personnel;
 import cn.cslg.pas.common.model.cronModel.PersonnelVO;
 import cn.cslg.pas.common.model.cronModel.Records;
@@ -11,6 +12,7 @@ import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.business.InvalidRecordVO;
 import cn.cslg.pas.common.vo.business.ReVO;
 import cn.cslg.pas.common.vo.business.ReportVO;
+import cn.cslg.pas.common.vo.invalidVO.ReportAffairVO;
 import cn.cslg.pas.domain.BaseEntity;
 import cn.cslg.pas.domain.business.*;
 import cn.cslg.pas.exception.XiaoShiException;
@@ -377,39 +379,13 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
      */
     public List<String> loadFileGuids(Integer projectId) {
         List<String> fileGuids = new ArrayList<>();
-//        LambdaQueryWrapper<AssoProjectFile> queryWrapper = new LambdaQueryWrapper<>();
-//        queryWrapper.eq(AssoProjectFile::getProjectId, projectId);
-//        List<AssoProjectFile> assoProjectFiles = assoProjectFileService.list(queryWrapper);
-//        if (!assoProjectFiles.isEmpty()) {
-//            fileGuids = assoProjectFiles.stream().map(AssoProjectFile::getFileGuid).collect(Collectors.toList());
-//        }
-        LambdaQueryWrapper<ReportAffair> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ReportAffair::getProjectId, projectId);
-        List<ReportAffair> reportAffairs = reportAffairService.list(queryWrapper);
-        if (!reportAffairs.isEmpty()) {
-            List<Integer> reportAffairIds = reportAffairs.stream()
-                    .sorted(Comparator.comparing(ReportAffair::getOccurredTime, Comparator.nullsLast(Comparator.reverseOrder())))
-                    .map(ReportAffair::getId)
-                    .collect(Collectors.toList());
-
-            Map<Integer, Date> reportAffairTimeMap = reportAffairs.stream()
-                    .collect(Collectors.toMap(ReportAffair::getId, ReportAffair::getOccurredTime));
-
-            LambdaQueryWrapper<AssoReportAffairFile> queryWrapper1 = new LambdaQueryWrapper<>();
-            queryWrapper1.in(AssoReportAffairFile::getReportAffairId, reportAffairIds);
-            List<AssoReportAffairFile> assoReportAffairFiles = assoReportAffairFileService.list(queryWrapper1);
-
-            if (!assoReportAffairFiles.isEmpty()) {
-
-                List<AssoReportAffairFile> filteredFiles = assoReportAffairFiles.stream()
-                        .filter(assoFile -> reportAffairIds.contains(assoFile.getReportAffairId()))
-                        .collect(Collectors.toList());
-
-                fileGuids = filteredFiles.stream()
-                        .sorted(Comparator.comparing(file -> reportAffairTimeMap.getOrDefault(file.getReportAffairId(), null),
-                                Comparator.nullsLast(Comparator.naturalOrder())))
-                        .map(AssoReportAffairFile::getFileGuid)
-                        .collect(Collectors.toList());
+        QueryReportAffairDTO queryReportAffairDTO = new QueryReportAffairDTO();
+        queryReportAffairDTO.setProjectId(projectId);
+        List<ReportAffairVO> reportAffairVOS = reportAffairService.queryReportAffair(queryReportAffairDTO);
+        for (ReportAffairVO reportAffairVO : reportAffairVOS) {
+            List<SystemFile> systemFiles = reportAffairVO.getSystemFileList();
+            for (SystemFile systemFile : systemFiles) {
+                fileGuids.add(systemFile.getGuid());
             }
         }
         return fileGuids;