fixed

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

@@ -247,7 +247,8 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         final String claimText = vo.getClaimText();
         final Long count = invalidStatueMapper.selectCount(new LambdaQueryWrapper<FinalInvalidStatue>()
                 .eq(FinalInvalidStatue::getStatuteId, statuteId)
-                .eq(FinalInvalidStatue::getClaimOrder, claimSort));
+                .eq(FinalInvalidStatue::getClaimOrder, claimSort)
+                .eq(FinalInvalidStatue::getProjectId, vo.getProjectId()));
         if (count > 0) {
             throw new XiaoShiException("该法条下已存在相同权利要求");
         }
@@ -265,6 +266,14 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         statue.setCreateId(personnelVO.getId());
         statue.setCreateTime(new Date());
         statue.insert();
+
+        FinalProofGroup proofGroup = new FinalProofGroup();
+        proofGroup.setFinalInvalidStatueId(statue.getId());
+        proofGroup.setProjectId(vo.getProjectId());
+        proofGroup.setFeatureSort(1);
+        proofGroup.setCreateId(personnelVO.getId());
+        proofGroup.setCreateTime(new Date());
+        proofGroup.insert();
         return statue.getId();
     }
 
@@ -300,8 +309,6 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         for (FinalInvalidStatue statue : statueList) {
              Integer invalidStatueId = statue.getId();
             List<FinalProofGroup> statueGroups = proofGroups.stream().filter(item -> item.getFinalInvalidStatueId().equals(invalidStatueId)).collect(Collectors.toList());
-//            List<FinalProofGroup> statueGroups = proofGroups.stream().filter(item -> item.getFinalInvalidStatueId().equals(invalidStatueId))
-//                    .filter(i -> i.getFeatureSort() != null).sorted(Comparator.comparing(FinalProofGroup::getFeatureSort)).collect(Collectors.toList());
             statueGroups.forEach(item -> {
                 GetInvalidReasonClaimsVO claimsVO = new GetInvalidReasonClaimsVO();
                 InvalidReasonDTO invalidReasonDTO = new InvalidReasonDTO();
@@ -340,6 +347,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         final Long count = invalidStatueMapper.selectCount(new LambdaQueryWrapper<FinalInvalidStatue>()
                 .eq(FinalInvalidStatue::getStatuteId, statuteId)
                 .eq(FinalInvalidStatue::getClaimOrder, claimSort)
+                .eq(FinalInvalidStatue::getProjectId, vo.getProjectId())
                 .ne(FinalInvalidStatue::getId, vo.getInvalidStatueId()));
         if (count > 0) {
             throw new XiaoShiException("该法条下已存在相同权利要求");

src/main/resources/jsons/claimManage.json

@@ -12,7 +12,7 @@
   {"name":"第一次修改说明",
     "type":"String",
     "value":"historyDescription1",
-    "field":"historyContent1",
+    "field":"historyDescription1",
     "sqlField": "",
     "ifSearch":"false",
     "ifGroup": "false",
@@ -27,7 +27,8 @@
     "ifSearch":"false",
     "ifGroup": "false",
     "ifShow":"true",
-    "ifAsCondition": "false"
+    "ifAsCondition": "false",
+    "defaultHidden": "true"
   },
   {"name":"第二次修改说明",
     "type":"String",
@@ -37,6 +38,7 @@
     "ifSearch":"false",
     "ifGroup": "false",
     "ifShow":"true",
-    "ifAsCondition": "false"
+    "ifAsCondition": "false",
+    "defaultHidden": "true"
   }
 ]

src/main/resources/jsons/finalInvalidReason.json

@@ -77,7 +77,8 @@
     "ifGroup": "false",
     "ifShow":"true",
     "ifAsCondition": "false",
-    "editable":true
+    "editable":true,
+    "defaultHidden": "true"
   }
 ]
 

src/main/resources/jsons/finalInvalidReasonInThree.json

@@ -88,7 +88,8 @@
     "ifGroup": "false",
     "ifShow":"true",
     "ifAsCondition": "false",
-    "editable":true
+    "editable":true,
+    "defaultHidden": "true"
   }
 ]
 

src/test/java/cn/cslg/pas/service/InvalidStatueTests.java

@@ -49,6 +49,16 @@ public class InvalidStatueTests {
     }
 
     @Test
+    public void test11() {
+        InvalidReasonDTO dto = addInvalid();
+        try {
+            finalInvalidStatueService.addInvalidReason(dto);
+        } catch (Exception e) {
+            Assertions.assertEquals("该法条下已存在相同权利要求", e.getMessage());
+        }
+    }
+
+    @Test
     public void test1() {
         GetInvalidReasonClaimsDTO dto = new GetInvalidReasonClaimsDTO();
         dto.setProjectId(368);
@@ -80,9 +90,11 @@ public class InvalidStatueTests {
         final Integer statueId = finalInvalidStatueService.addInvalidReason(dto);
         dto.setInvalidStatueId(statueId);
         dto.setClaimText("ioioioioioioioiioio");
-        final Integer id = finalInvalidStatueService.editInvalidReason(dto);
-        Assertions.assertNotNull(id);
-        finalInvalidStatueService.delInvalidReason(dto);
+        try {
+            finalInvalidStatueService.editInvalidReason(dto);
+        } catch (Exception e) {
+            Assertions.assertEquals("该法条下已存在相同权利要求", e.getMessage());
+        }
     }
 
     @Test