Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/service/FinalInvalidStatueService.java

@@ -101,7 +101,9 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         Integer statusType = finalProfGroupQueryDTO.getStatueType();
         //根据projectId查询最终无效理由和证据
         LambdaQueryWrapper<FinalInvalidStatue> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(FinalInvalidStatue::getProjectId, projectId);
+        queryWrapper.eq(FinalInvalidStatue::getProjectId, projectId)
+                    .orderByAsc(FinalInvalidStatue::getStatuteId)
+                    .orderByAsc(FinalInvalidStatue::getClaimOrder);
 
         if (statusType != null) {
             if (statusType.equals(1)) {
@@ -121,20 +123,23 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         LambdaQueryWrapper<FinalProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.in(FinalProofGroup::getFinalInvalidStatueId, ids).orderByDesc(FinalProofGroup::getFinalInvalidStatueId);
         finalProofGroups = finalProofGroupService.list(queryWrapper1);
-        finalProofGroups.forEach(item -> {
-            FinalProfGroupVO finalProfGroupVO = new FinalProfGroupVO();
-            FinalInvalidStatue finalInvalidStatue = finalInvalidStatues.stream()
-                    .filter(tem -> tem.getId().equals(item.getFinalInvalidStatueId())).findFirst().orElse(null);
-            if (finalInvalidStatue != null) {
-                finalProfGroupVO.setInvalidStatue(finalInvalidStatue);
-            }
-            finalProfGroupVO.setId(item.getId());
-            finalProfGroupVO.setPresentOpinions(item.getPresentOpinions());
-            finalProfGroupVO.setInvalidReason(item.getInvalidReason());
-            finalProfGroupVO.setRbDecision(item.getRbDecision());
-            finalProfGroupVOS.add(finalProfGroupVO);
 
-        });
+        for(FinalInvalidStatue finalInvalidStatue:finalInvalidStatues)
+        {
+            Integer id =finalInvalidStatue.getId();
+ List<FinalProofGroup> statueGroups =finalProofGroups.stream().filter(item->item.getFinalInvalidStatueId().equals(id)).collect(Collectors.toList());
+ statueGroups.forEach(item->{
+     FinalProfGroupVO finalProfGroupVO = new FinalProfGroupVO();
+     if (finalInvalidStatue != null) {
+         finalProfGroupVO.setInvalidStatue(finalInvalidStatue);
+     }
+     finalProfGroupVO.setId(item.getId());
+     finalProfGroupVO.setPresentOpinions(item.getPresentOpinions());
+     finalProfGroupVO.setInvalidReason(item.getInvalidReason());
+     finalProfGroupVO.setRbDecision(item.getRbDecision());
+     finalProfGroupVOS.add(finalProfGroupVO);
+ });
+        }
         return finalProfGroupVOS;
     }
 

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -1120,9 +1120,9 @@ public class PatentStarApiService {
             if (StringUtils.isNotEmpty(pdfUrlStr)) {
                 if (pdfUrlStr.contains("|http")) {  //若包含公开和授权两个pdf
                     String[] pdfUrlArr = pdfUrlStr.split("\\|http");
-                    pdfUrl1 = pdfUrlArr[0].substring(pdfUrlArr[0].indexOf("http"), pdfUrlArr[0].indexOf("|"));
+                    pdfUrl1 = pdfUrlArr[0].substring(pdfUrlArr[0].indexOf("http"), pdfUrlArr[0].indexOf("?"));
                     pdfUrlArr[1] = "http" + pdfUrlArr[1];
-                    pdfUrl2 = pdfUrlArr[1].substring(pdfUrlArr[1].indexOf("http"), pdfUrlArr[1].indexOf("|"));
+                    pdfUrl2 = pdfUrlArr[1].substring(pdfUrlArr[1].indexOf("http"), pdfUrlArr[1].indexOf("?"));
 
                     if (pdfUrl1.contains("0A_CN_0.pdf")) {
 

src/main/resources/jsons/invalidReportProject.json

@@ -128,7 +128,8 @@
     "ifSearch":"false",
     "ifGroup": "false",
     "ifShow":"true",
-    "defaultHidden": "false"
+    "defaultHidden": "false",
+    "ifSort": "false"
   },
   {"name":"创建人",
     "type":"String",