From 926a1fc891a00a5ef728817f3975abd114e0f5cd Mon Sep 17 00:00:00 2001 From: SondonYong Date: Fri, 21 Nov 2025 17:14:02 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=A4=BE=E4=BC=9A=E4=BF=A1=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?;=E4=BA=BA=E5=91=98=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/CorpInfoController.java | 10 +++++ .../info/command/query/CorpInfoQueryExe.java | 16 +++++++ .../info/service/CorpInfoServiceImpl.java | 5 +++ .../basic/info/api/CorpInfoServiceI.java | 2 + .../basic/info/dto/CorpInfoCheckCodeQry.java | 42 +++++++++++++++++++ .../basic/info/domain/model/ImgFilesE.java | 1 - .../mapper/UserQualificationInfoMapper.java | 4 ++ .../UserQualificationInfoRepositoryImpl.java | 7 ++-- .../mapper/UserQualificationInfoMapper.xml | 38 +++++++++++++++++ 9 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoCheckCodeQry.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index 065c3bc..1072b7b 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -40,6 +40,16 @@ public class CorpInfoController { return corpInfoService.add(cmd); } + @ApiOperation("判断统一社会信用代码是否重复, true:没重复, false:有重复") + @PostMapping("/checkCorpCode") + public SingleResponse checkCorpCode(@Validated @RequestBody CorpInfoCheckCodeQry qry) { + if(corpInfoService.checkCorpCode(qry)){ + return SingleResponse.of(true); + }else { + return SingleResponse.of(false); + } + } + @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@Validated @RequestBody CorpInfoPageQry qry) { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 7a45d49..c7837a8 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -9,6 +9,7 @@ import com.zcloud.basic.info.domain.model.CorpDepartmentE; import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.dto.CorpDepartmentQry; +import com.zcloud.basic.info.dto.CorpInfoCheckCodeQry; import com.zcloud.basic.info.dto.CorpInfoPageQry; import com.zcloud.basic.info.dto.CorpUserMiddleQry; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; @@ -67,6 +68,21 @@ public class CorpInfoQueryExe { return corpInfoCO; } + public Boolean execute(CorpInfoCheckCodeQry qry) { + List list = new ArrayList<>(); + if(qry.getId() != null && qry.getId() > 0L){ + list = corpInfoRepository.getCorpinfoByCodeAndId(qry.getCode(), qry.getId()); + }else { + list = corpInfoRepository.getCorpinfoByCode(qry.getCode()); + } + + if(CollUtil.isEmpty(list)){ + return true; + }else { + return false; + } + } + public PageResponse corpDepartlist(CorpDepartmentQry corpDepartmentQry) { Map parmas = PageQueryHelper.toHashMap(corpDepartmentQry); PageResponse pageResponse = corpInfoRepository.listPage(parmas); diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index fee062c..5aae70d 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -49,6 +49,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { return SingleResponse.buildSuccess(); } + @Override + public Boolean checkCorpCode(CorpInfoCheckCodeQry qry) { + return corpInfoQueryExe.execute(qry); + } + @Override public void edit(CorpInfoUpdateCmd corpInfoUpdateCmd) { corpInfoUpdateExe.execute(corpInfoUpdateCmd); diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index 9d71e3b..da1d062 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -21,6 +21,8 @@ public interface CorpInfoServiceI { SingleResponse add(CorpInfoAddCmd cmd); + Boolean checkCorpCode(CorpInfoCheckCodeQry qry); + void edit(CorpInfoUpdateCmd cmd); void remove(Long id); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoCheckCodeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoCheckCodeQry.java new file mode 100644 index 0000000..6be74a4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoCheckCodeQry.java @@ -0,0 +1,42 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.math.BigDecimal; +import java.time.LocalDate; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-30 15:12:50 + */ +@Data +public class CorpInfoCheckCodeQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + + + @ApiModelProperty(value = "企业id", name = "id") + private Long id; + + @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) + @NotEmpty(message = "统一社会信用代码不能为空") + private String code; + +} + diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java index 6213de7..a4c883e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/ImgFilesE.java @@ -2,7 +2,6 @@ package com.zcloud.basic.info.domain.model; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.gbscommon.utils.*; -import com.zcloud.basic.info.domain.utils.Smb; import lombok.Data; import org.apache.commons.beanutils.BeanUtils; import org.springframework.util.ObjectUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserQualificationInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserQualificationInfoMapper.java index 25d0005..f45a25d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserQualificationInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserQualificationInfoMapper.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * web-infrastructure * @Author SondonYong @@ -18,5 +20,7 @@ public interface UserQualificationInfoMapper extends BaseMapper selectQualificationInfoPage(IPage page, @Param("ew") QueryWrapper queryWrapper); + List selectQualificationInfoList(@Param("ew") QueryWrapper queryWrapper); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java index a16218b..f979f9e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java @@ -52,9 +52,10 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.orderByDesc("create_time"); - List result = userQualificationInfoMapper.selectList(queryWrapper); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "a."); + queryWrapper.eq("a.delete_enum", "FALSE"); + queryWrapper.orderByDesc("a.create_time"); + List result = userQualificationInfoMapper.selectQualificationInfoList(queryWrapper); return MultiResponse.of(result); } diff --git a/web-infrastructure/src/main/resources/mapper/UserQualificationInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/UserQualificationInfoMapper.xml index 87d19ce..324af1d 100644 --- a/web-infrastructure/src/main/resources/mapper/UserQualificationInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserQualificationInfoMapper.xml @@ -41,5 +41,43 @@ left join department d on u.department_id = d.id ${ew.customSqlSegment} + +