From d41bbb6ffbe4f6e38a86ba193ec2e3422a445f51 Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Tue, 27 Jan 2026 11:37:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificate/web/CorpCertificateController.java | 6 ++++++ .../certificate/web/UserCertificateController.java | 6 ++++++ .../command/query/CorpCertificateQueryExe.java | 9 +++++++++ .../command/query/UserCertificateQueryExe.java | 11 +++++++++++ .../service/CorpCertificateServiceImpl.java | 5 +++++ .../service/UserCertificateServiceImpl.java | 5 +++++ .../certificate/api/CorpCertificateServiceI.java | 5 +++++ .../certificate/api/UserCertificateServiceI.java | 5 +++++ .../dto/clientobject/UserCertificateCO.java | 3 +++ .../certificate/domain/model/UserCertificateE.java | 4 ++++ .../repository/UserCertificateRepository.java | 2 ++ .../impl/UserCertificateRepositoryImpl.java | 1 + .../main/resources/mapper/UserCertificateMapper.xml | 2 +- 13 files changed, 63 insertions(+), 1 deletion(-) diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java index e255995..277e819 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/CorpCertificateController.java +++ b/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 isExistCertNo(@RequestParam(value = "certNo") String certNo) { + return SingleResponse.of(corpCertificateService.isExistCertNo(certNo)); + } + } diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java index f5806ba..c506d4c 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java @@ -93,5 +93,11 @@ public class UserCertificateController { public PageResponse corpCertificateStatPage(@RequestBody CorpCertificateStatPageQry qry) { return userCertificateService.corpCertificateStatPage(qry); } + + @ApiOperation("判断证件编号是否已存在") + @GetMapping("/isExistCertNo") + public SingleResponse isExistCertNo(@RequestParam(value = "certNo") String certNo) { + return SingleResponse.of(userCertificateService.isExistCertNo(certNo)); + } } diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java index 9796548..ddb8a8a 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/CorpCertificateQueryExe.java +++ b/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() + .eq(CorpCertificateDO::getCertificateCode, certNo)) > 0; + } + } diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java index 8eff762..155e064 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java +++ b/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() + .eq(UserCertificateDO::getCertificateCode, certNo) + ) > 0; + } + } diff --git a/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java index 6567630..19ff24d 100644 --- a/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/certificate/service/CorpCertificateServiceImpl.java @@ -69,5 +69,10 @@ public class CorpCertificateServiceImpl implements CorpCertificateServiceI { public PageResponse statPage(CorpCertificateStatPageQry qry) { return corpCertificateQueryExe.statPage(qry); } + + @Override + public boolean isExistCertNo(String certNo) { + return corpCertificateQueryExe.checkCertNoExist(certNo); + } } diff --git a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java index 76316a8..699c04e 100644 --- a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java @@ -75,5 +75,10 @@ public class UserCertificateServiceImpl implements UserCertificateServiceI { public List listAll(UserCertificatePageQry qry) { return userCertificateQueryExe.listAll(qry); } + + @Override + public boolean isExistCertNo(String certNo) { + return userCertificateQueryExe.checkCertNoExist(certNo); + } } diff --git a/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java index 1723345..bc3d7da 100644 --- a/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java +++ b/web-client/src/main/java/com/zcloud/certificate/api/CorpCertificateServiceI.java @@ -33,5 +33,10 @@ public interface CorpCertificateServiceI { * 股份端查看分公司证照统计信息 */ PageResponse statPage(CorpCertificateStatPageQry qry); + + /** + * 判断证书编号是否存在 + */ + boolean isExistCertNo(String certNo); } diff --git a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java index 2bb3479..c3e48bd 100644 --- a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java +++ b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java @@ -39,5 +39,10 @@ public interface UserCertificateServiceI { * 查询所有人员证照 */ List listAll(UserCertificatePageQry qry); + + /** + * 查询证书编号是否存在 + */ + boolean isExistCertNo(String certNo); } diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java index a07563f..bc4ae1c 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java +++ b/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; + } diff --git a/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java b/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java index 7cb900b..b467de0 100644 --- a/web-domain/src/main/java/com/zcloud/certificate/domain/model/UserCertificateE.java +++ b/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) { diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java index 44d0472..ba6fde6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java @@ -41,5 +41,7 @@ public interface UserCertificateRepository extends BaseRepository listAll(Map params); + + } diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java index 98bf212..22b1073 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java @@ -72,5 +72,6 @@ public class UserCertificateRepositoryImpl extends BaseRepositoryImpl result = userCertificateMapper.selectList(queryWrapper); return result; } + } diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index 44ee7be..bc1820c 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/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