zcloud_gbs
/
zcloud_gbs_certificate
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修复测试bug

main
shenzhidan 2026-01-23 17:21:19 +08:00
parent 928bcdc25e
commit aac0aa136f
6 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/src/main/java/com/zcloud/certificate/command/CorpCertificateAddExe.java
View File

@ -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();

8
web-client/src/main/java/com/zcloud/certificate/dto/CorpCertificateStatPageQry.java
View File

@ -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;
}

10
web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/CorpCertificateGatewayImpl.java
View File

@ -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<CorpCertificateDO>()
Long count = corpCertificateRepository.lambdaQuery()
.eq(CorpCertificateDO::getCertificateCode, d.getCertificateCode())
);
return queryDO == null;
.ne(corpCertificateE.getCorpCertificateId() != null, CorpCertificateDO::getCorpCertificateId, corpCertificateE.getCorpCertificateId())
.count();
return count > 0;
}
}

4
web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/CorpCertificateMapper.java
View File

@ -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<CorpCertificateDO> {
List<CorpInfoDO> selectCorpCertStatPage(Map<String, Object> params);
IPage<CorpInfoDO> selectCorpCertStatPage(IPage<CorpInfoDO> page, @Param("params") Map<String, Object> params);
}

12
web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/CorpCertificateRepositoryImpl.java
View File

@ -55,15 +55,9 @@ public class CorpCertificateRepositoryImpl extends BaseRepositoryImpl<CorpCertif
@Override
public PageResponse<CorpInfoDO> statPage(Map<String, Object> params) {
Integer pageIndex = (Integer) params.get("pageIndex");
Integer pageSize = (Integer) params.get("pageSize");
params.put("offset", (pageIndex - 1) * pageSize);
List<CorpInfoDO> rows = corpCertificateMapper.selectCorpCertStatPage(params);
long total = rows.isEmpty() ? 0 : rows.get(0).getTotalCount();
return PageResponse.of(rows, (int)total, pageSize, pageIndex);
IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
IPage<CorpInfoDO> page = corpCertificateMapper.selectCorpCertStatPage(iPage, params);
return PageHelper.pageToResponse(page, iPage.getRecords());
}
}

56
web-infrastructure/src/main/resources/mapper/CorpCertificateMapper.xml
View File

@ -6,39 +6,45 @@
<select id="selectCorpCertStatPage" resultType="com.zcloud.certificate.persistence.dataobject.CorpInfoDO">
SELECT
ci.id AS corpId,
ci.corp_name AS corpName,
ci.type AS corpType,
COUNT(cc.id) AS certCount,
COUNT(*) OVER() AS totalCount
ci.id AS corpId,
ci.corp_name AS corpName,
ci.type AS corpType,
COUNT(cc.id) AS certCount,
COUNT(*) OVER() AS totalCount
FROM
corp_info ci
corp_info ci
LEFT JOIN
corp_certificate cc
corp_certificate cc
ON
cc.corpinfo_id = ci.id
cc.corpinfo_id = ci.id
AND
(cc.delete_enum IS NULL OR cc.delete_enum &lt;&gt; 'true')
WHERE
1 = 1
<if test="corpType != null">
AND (
(#{corpType} = 0 AND ci.type IN (0,1))
OR (#{corpType} = 1 AND ci.type IN (3,4,5))
)
</if>
(cc.delete_enum IS NULL OR cc.delete_enum &lt;&gt; 'true')
<if test="corpName != null and corpName != ''">
AND ci.corp_name LIKE CONCAT('%', #{corpName}, '%')
</if>
<if test="params.geCertificateDateStart != null and params.geCertificateDateStart != ''">
AND cc.certificate_date_start &gt;= #{params.geCertificateDateStart}
</if>
<if test="params.leCertificateDateEnd != null and params.leCertificateDateEnd != ''">
AND cc.certificate_date_end &lt;= #{params.leCertificateDateEnd}
</if>
WHERE
1 = 1
<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))
)
</if>
<if test="params.corpName != null and params.corpName != ''">
AND ci.corp_name LIKE CONCAT('%', #{params.corpName}, '%')
</if>
GROUP BY
ci.id, ci.corp_name, ci.type
ci.id, ci.corp_name, ci.type
ORDER BY
ci.id DESC
LIMIT #{offset}, #{pageSize}
ci.id DESC
</select>
</mapper>