1、新增证书编号是否存在校验

2、修改岗位信息获取方式

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

@@ -82,5 +82,11 @@ public class CorpCertificateController {
         return corpCertificateService.statPage(qry);
     }
 
+    @ApiOperation("判断证书编号是否存在")
+    @GetMapping("/isExistCertNo")
+    public SingleResponse<Boolean> isExistCertNo(@RequestParam(value = "certNo") String certNo) {
+        return SingleResponse.of(corpCertificateService.isExistCertNo(certNo));
+    }
+
 }
 

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

@@ -93,5 +93,11 @@ public class UserCertificateController {
     public PageResponse<UserCertificateStatCO> corpCertificateStatPage(@RequestBody CorpCertificateStatPageQry qry) {
         return userCertificateService.corpCertificateStatPage(qry);
     }
+
+    @ApiOperation("判断证件编号是否已存在")
+    @GetMapping("/isExistCertNo")
+    public SingleResponse<Boolean> isExistCertNo(@RequestParam(value = "certNo") String certNo) {
+        return SingleResponse.of(userCertificateService.isExistCertNo(certNo));
+    }
 }
 

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

@@ -1,6 +1,7 @@
 package com.zcloud.certificate.command.query;
 
 import com.alibaba.cola.dto.MultiResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.certificate.command.convertor.CorpCertificateCoConvertor;
@@ -75,6 +76,14 @@ public class CorpCertificateQueryExe {
         return PageResponse.of(cos, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
 
+    /**
+     * 判断证书编号是否存在
+     */
+    public boolean  checkCertNoExist(String certNo) {
+        return corpCertificateRepository.count(new LambdaQueryWrapper<CorpCertificateDO>()
+                .eq(CorpCertificateDO::getCertificateCode, certNo)) > 0;
+    }
+
 
 }
 

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

@@ -1,5 +1,7 @@
 package com.zcloud.certificate.command.query;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jjb.saas.framework.auth.model.SSOUser;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.certificate.command.convertor.UserCertificateCoConvertor;
@@ -127,6 +129,15 @@ public class UserCertificateQueryExe {
         });
     }
 
+    /**
+     * 查询证书编号是否存在
+     */
+    public boolean checkCertNoExist(String certNo) {
+        return userCertificateRepository.count(new LambdaQueryWrapper<UserCertificateDO>()
+                .eq(UserCertificateDO::getCertificateCode, certNo)
+        ) > 0;
+    }
+
 
 }
 

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

@@ -69,5 +69,10 @@ public class CorpCertificateServiceImpl implements CorpCertificateServiceI {
     public PageResponse<CertificateStatisticsCO> statPage(CorpCertificateStatPageQry qry) {
         return corpCertificateQueryExe.statPage(qry);
     }
+
+    @Override
+    public boolean isExistCertNo(String certNo) {
+        return corpCertificateQueryExe.checkCertNoExist(certNo);
+    }
 }
 

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

@@ -75,5 +75,10 @@ public class UserCertificateServiceImpl implements UserCertificateServiceI {
     public List<UserCertificateCO> listAll(UserCertificatePageQry qry) {
         return userCertificateQueryExe.listAll(qry);
     }
+
+    @Override
+    public boolean isExistCertNo(String certNo) {
+        return userCertificateQueryExe.checkCertNoExist(certNo);
+    }
 }
 

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

@@ -33,5 +33,10 @@ public interface CorpCertificateServiceI {
      * 股份端查看分公司证照统计信息
      */
     PageResponse<CertificateStatisticsCO> statPage(CorpCertificateStatPageQry qry);
+
+    /**
+     * 判断证书编号是否存在
+     */
+    boolean isExistCertNo(String certNo);
 }
 

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

@@ -39,5 +39,10 @@ public interface UserCertificateServiceI {
      * 查询所有人员证照
      */
     List<UserCertificateCO> listAll(UserCertificatePageQry qry);
+
+    /**
+     * 查询证书编号是否存在
+     */
+    boolean isExistCertNo(String certNo);
 }
 

web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java

@@ -141,6 +141,9 @@ public class UserCertificateCO extends ClientObject {
     @ApiModelProperty(value = "企业名称")
     private String corpinfoName;
 
+    @ApiModelProperty(value = "人员岗位名称")
+    private String userPostName;
+
 
 }
 

web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java

@@ -69,6 +69,9 @@ public class UserCertificateE extends BaseE {
     //企业名称
     private String corpinfoName;
 
+    //人员岗位名称
+    private String userPostName;
+
     public void attach(UserBasicInfo userBasicInfo) {
         if (userBasicInfo == null) return;
         this.userName = userBasicInfo.getUserName();
@@ -76,6 +79,7 @@ public class UserCertificateE extends BaseE {
         this.employmentStatus = userBasicInfo.getEmploymentStatus();
         this.departmentName = userBasicInfo.getDepartmentName();
         this.corpinfoName = userBasicInfo.getCorpinfoName();
+        this.userPostName = userBasicInfo.getPostName();
     }
 
     public void corpUserInfo(SSOUser ssoUser) {

web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java

@@ -41,5 +41,7 @@ public interface UserCertificateRepository extends BaseRepository<UserCertificat
      * 查询所有人员证照
      */
     List<UserCertificateDO> listAll(Map<String, Object> params);
+
+
 }
 

web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java

@@ -72,5 +72,6 @@ public class UserCertificateRepositoryImpl extends BaseRepositoryImpl<UserCertif
         List<UserCertificateDO> result = userCertificateMapper.selectList(queryWrapper);
         return result;
     }
+
 }
 

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

@@ -121,7 +121,7 @@
             u.name              AS name,
             d.name              AS departmentName,
             p.corpinfo_name     AS corpinfoName,
-            p.post_name         AS postName,
+            COALESCE(NULLIF(u.post_name, ''), p.post_name) AS postName,
             u.employment_flag   AS employmentStatus
         FROM
             user u