Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/cslg/pas/common/utils/FileUtils.java

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

@@ -27,10 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -139,6 +136,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         if (patentNo == null || StringUtils.isEmpty(patentNo)) {
             throw new XiaoShiException("入参为空");
         }
+        //查询当前登陆人
         PersonnelVO personnelVO = new PersonnelVO();
         try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
@@ -146,12 +144,14 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
             throw new XiaoShiException("未查询到当前登陆人");
         }
         Integer tenantId = personnelVO.getTenantId();
+
         LambdaQueryWrapper<InvalidRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(InvalidRecord::getPatentNo, patentNo)
                 .eq(InvalidRecord::getTenantId, tenantId);
         List<InvalidRecord> invalidRecords = this.list(queryWrapper);
 
         if (!invalidRecords.isEmpty()) {
+
             invalidRecords.forEach(item -> {
                 InvalidRecordVO invalidRecordVO = new InvalidRecordVO();
                 BeanUtils.copyProperties(item, invalidRecordVO);
@@ -159,7 +159,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
 
                 LambdaQueryWrapper<AssoOtherPatentInfoFile> queryWrapper1 = new LambdaQueryWrapper<>();
                 queryWrapper1.eq(AssoOtherPatentInfoFile::getOtherPatentInfoId, invalidRecordVO.getId())
-                        .eq(AssoOtherPatentInfoFile::getType, 6);
+                        .eq(AssoOtherPatentInfoFile::getType, 6);//类型为6 被无效历史
                 List<AssoOtherPatentInfoFile> assoOtherPatentInfoFiles = assoOtherPatentInfoFileService.list(queryWrapper1);
                 if (!assoOtherPatentInfoFiles.isEmpty()) {
                     List<String> fileGuids = assoOtherPatentInfoFiles.stream().map(AssoOtherPatentInfoFile::getFileGuid).collect(Collectors.toList());
@@ -265,6 +265,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
                         invalidRecordVO.setJudgementTime(judgeTime);
                         invalidRecordVO.setCreateId(project.getCreateId());
                         invalidRecordVO.setCreateTime(project.getCreateTime());
+                        //根据报告id获取报告事务文件集合
                         List<String> fileGuids = this.loadFileGuids(item.getProjectId());
                         invalidRecordVO.setFileGuids(fileGuids);
                         invalidRecordVO.setIfAdd(false);
@@ -352,7 +353,11 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         return reVO;
     }
 
-
+    /**
+     * 根据报告id获取附件集合
+     * @param projectId
+     * @return
+     */
     public List<String> loadFileGuids(Integer projectId){
         List<String> fileGuids = new ArrayList<>();
 //        LambdaQueryWrapper<AssoProjectFile> queryWrapper = new LambdaQueryWrapper<>();
@@ -365,7 +370,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         queryWrapper.eq(ReportAffair::getProjectId, projectId);
         List<ReportAffair> reportAffairs = reportAffairService.list(queryWrapper);
         if (!reportAffairs.isEmpty()) {
-            List<Integer> reportAffairIds = reportAffairs.stream().map(ReportAffair::getId).collect(Collectors.toList());
+            List<Integer> reportAffairIds = reportAffairs.stream()
+                    .sorted(Comparator.comparing(ReportAffair::getOccurredTime).reversed())
+                    .map(ReportAffair::getId).collect(Collectors.toList());
             LambdaQueryWrapper<AssoReportAffairFile> queryWrapper1 = new LambdaQueryWrapper<>();
             queryWrapper1.in(AssoReportAffairFile::getReportAffairId, reportAffairIds);
             List<AssoReportAffairFile> assoReportAffairFiles = assoReportAffairFileService.list(queryWrapper1);