From aac0aa136f1ed3efb78327e0aa980e88098db47f Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Fri, 23 Jan 2026 17:21:19 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/CorpCertificateAddExe.java | 2 +- .../dto/CorpCertificateStatPageQry.java | 8 +++ .../CorpCertificateGatewayImpl.java | 10 +++- .../mapper/CorpCertificateMapper.java | 4 +- .../impl/CorpCertificateRepositoryImpl.java | 12 +--- .../mapper/CorpCertificateMapper.xml | 56 ++++++++++--------- 6 files changed, 53 insertions(+), 39 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java index f947421..6bf14e3 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java @@ -32,7 +32,7 @@ public class CorpCertificateAddExe { BeanUtils.copyProperties(cmd, corpCertificateE); Boolean certificate = corpCertificateGateway.checkCertificateExist(corpCertificateE); - if (!certificate) { + if (certificate) { throw new BizException("证照编号已存在"); } SSOUser ssoUser = AuthContext.getCurrentUser(); diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateStatPageQry.java b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateStatPageQry.java index 54a8130..841bbdc 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateStatPageQry.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateStatPageQry.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.Valid; + @Data public class CorpCertificateStatPageQry extends PageQuery { @@ -12,4 +14,10 @@ public class CorpCertificateStatPageQry extends PageQuery { @ApiModelProperty(value = "企业名称-模糊查询") private String corpName; + + @ApiModelProperty(value = "查询开始时间") + private String geCertificateDateStart; + + @ApiModelProperty(value = "查询结束时间") + private String leCertificateDateEnd; } diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java index a185529..4003284 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java @@ -1,9 +1,11 @@ package com.zcloud.certificate.gatewayimpl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zcloud.certificate.domain.gateway.CorpCertificateGateway; import com.zcloud.certificate.domain.model.CorpCertificateE; import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; +import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.zcloud.certificate.persistence.repository.CorpCertificateRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -11,6 +13,7 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.Collections; +import java.util.List; /** * web-infrastructure @@ -53,10 +56,11 @@ public class CorpCertificateGatewayImpl implements CorpCertificateGateway { public Boolean checkCertificateExist(CorpCertificateE corpCertificateE) { CorpCertificateDO d = new CorpCertificateDO(); BeanUtils.copyProperties(corpCertificateE, d); - CorpCertificateDO queryDO = corpCertificateRepository.getOne(new LambdaQueryWrapper() + Long count = corpCertificateRepository.lambdaQuery() .eq(CorpCertificateDO::getCertificateCode, d.getCertificateCode()) - ); - return queryDO == null; + .ne(corpCertificateE.getCorpCertificateId() != null, CorpCertificateDO::getCorpCertificateId, corpCertificateE.getCorpCertificateId()) + .count(); + return count > 0; } } diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java index e39d826..f50124b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java @@ -1,9 +1,11 @@ package com.zcloud.certificate.persistence.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.certificate.persistence.dataobject.CorpCertificateDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.certificate.persistence.dataobject.CorpInfoDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -17,7 +19,7 @@ import java.util.Map; @Mapper public interface CorpCertificateMapper extends BaseMapper { - List selectCorpCertStatPage(Map params); + IPage selectCorpCertStatPage(IPage page, @Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java index dd23421..91896e3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java @@ -55,15 +55,9 @@ public class CorpCertificateRepositoryImpl extends BaseRepositoryImpl statPage(Map params) { - Integer pageIndex = (Integer) params.get("pageIndex"); - Integer pageSize = (Integer) params.get("pageSize"); - params.put("offset", (pageIndex - 1) * pageSize); - - List rows = corpCertificateMapper.selectCorpCertStatPage(params); - - long total = rows.isEmpty() ? 0 : rows.get(0).getTotalCount(); - - return PageResponse.of(rows, (int)total, pageSize, pageIndex); + IPage iPage = new Query().getPage(params); + IPage page = corpCertificateMapper.selectCorpCertStatPage(iPage, params); + return PageHelper.pageToResponse(page, iPage.getRecords()); } } diff --git a/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml index 9117d62..9306544 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml @@ -6,39 +6,45 @@