1、新增证书编号校验接口

2、新增相关方类型

web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java

@@ -84,8 +84,8 @@ public class CorpCertificateController {
 
     @ApiOperation("判断证书编号是否存在")
     @GetMapping("/isExistCertNo")
-    public SingleResponse<Boolean> isExistCertNo(@RequestParam(value = "certNo") String certNo) {
+    public SingleResponse<Boolean> isExistCertNo(@RequestParam(value = "certNo") String certNo, @RequestParam(value = "id", required = false) Long id) {
-        return SingleResponse.of(corpCertificateService.isExistCertNo(certNo));
+        return SingleResponse.of(corpCertificateService.isExistCertNo(certNo,  id));
     }
 
 }

web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java

@@ -96,8 +96,8 @@ public class UserCertificateController {
 
     @ApiOperation("判断证件编号是否已存在")
     @GetMapping("/isExistCertNo")
-    public SingleResponse<Boolean> isExistCertNo(@RequestParam(value = "certNo") String certNo) {
+    public SingleResponse<Boolean> isExistCertNo(@RequestParam(value = "certNo") String certNo, @RequestParam(value = "id", required = false) Long id) {
-        return SingleResponse.of(userCertificateService.isExistCertNo(certNo));
+        return SingleResponse.of(userCertificateService.isExistCertNo(certNo, id));
     }
 }
 

web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java

@@ -79,9 +79,11 @@ public class CorpCertificateQueryExe {
     /**
      * 判断证书编号是否存在
      */
-    public boolean  checkCertNoExist(String certNo) {
+    public boolean  checkCertNoExist(String certNo, Long id) {
         return corpCertificateRepository.count(new LambdaQueryWrapper<CorpCertificateDO>()
-                .eq(CorpCertificateDO::getCertificateCode, certNo)) > 0;
+                .eq(CorpCertificateDO::getCertificateCode, certNo)
+                .ne(id != null, CorpCertificateDO::getId, id)
+        ) > 0;
     }
 
 

web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java

@@ -132,9 +132,10 @@ public class UserCertificateQueryExe {
     /**
      * 查询证书编号是否存在
      */
-    public boolean checkCertNoExist(String certNo) {
+    public boolean checkCertNoExist(String certNo, Long id) {
         return userCertificateRepository.count(new LambdaQueryWrapper<UserCertificateDO>()
                 .eq(UserCertificateDO::getCertificateCode, certNo)
+                .ne(id != null, UserCertificateDO::getId, id)
         ) > 0;
     }
 

web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java

@@ -71,8 +71,8 @@ public class CorpCertificateServiceImpl implements CorpCertificateServiceI {
     }
 
     @Override
-    public boolean isExistCertNo(String certNo) {
+    public boolean isExistCertNo(String certNo, Long id) {
-        return corpCertificateQueryExe.checkCertNoExist(certNo);
+        return corpCertificateQueryExe.checkCertNoExist(certNo, id);
     }
 }
 

web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java

@@ -77,8 +77,8 @@ public class UserCertificateServiceImpl implements UserCertificateServiceI {
     }
 
     @Override
-    public boolean isExistCertNo(String certNo) {
+    public boolean isExistCertNo(String certNo, Long id) {
-        return userCertificateQueryExe.checkCertNoExist(certNo);
+        return userCertificateQueryExe.checkCertNoExist(certNo, id);
     }
 }
 

web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java

@@ -37,6 +37,6 @@ public interface CorpCertificateServiceI {
     /**
      * 判断证书编号是否存在
      */
-    boolean isExistCertNo(String certNo);
+    boolean isExistCertNo(String certNo, Long id);
 }
 

web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java

@@ -43,6 +43,6 @@ public interface UserCertificateServiceI {
     /**
      * 查询证书编号是否存在
      */
-    boolean isExistCertNo(String certNo);
+    boolean isExistCertNo(String certNo, Long id);
 }
 

web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml

@@ -33,7 +33,7 @@
         <if test="params.corpType != null">
             AND (
             (#{params.corpType} = 0 AND ci.type IN (0,1))
-            OR (#{params.corpType} = 1 AND ci.type IN (3,4,5))
+            OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6))
             )
         </if>
 

web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml

@@ -183,7 +183,7 @@
             <if test="params.corpType != null">
                 AND (
                 (#{params.corpType} = 0 AND ci.type IN (0,1))
-                OR (#{params.corpType} = 1 AND ci.type IN (3,4,5))
+                OR (#{params.corpType} = 1 AND ci.type IN (3,4,5,6))
                 )
             </if>