From db6e68d7d2efa5a455b88eac5041afbd7136fdc7 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 11 Dec 2025 17:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=81=E4=B8=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/CorpInfoController.java | 6 + .../info/command/query/CorpInfoQueryExe.java | 14 +- .../info/service/CorpInfoServiceImpl.java | 11 +- .../basic/info/api/CorpInfoServiceI.java | 7 +- .../zcloud/basic/info/dto/CorpInfoQry.java | 129 ++++++++++++++++++ .../repository/CorpInfoRepository.java | 1 + .../impl/CorpInfoRepositoryImpl.java | 12 ++ .../repository/impl/UserRepositoryImpl.java | 1 - 8 files changed, 167 insertions(+), 14 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.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 26c9a35..5e5697d 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 @@ -1,6 +1,7 @@ package com.zcloud.basic.info.web; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; @@ -54,6 +55,11 @@ public class CorpInfoController { public PageResponse page(@Validated @RequestBody CorpInfoPageQry qry) { return corpInfoService.listPage(qry); } + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll(CorpInfoQry corpInfoQry) { + return corpInfoService.listAll(corpInfoQry); + } @ApiOperation("详情") @PostMapping("/info/{id}") 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 ee3dada..31f4fd2 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 @@ -1,6 +1,7 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,10 +18,8 @@ import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; -import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; -import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; -import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; -import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; +import com.zcloud.basic.info.dto.clientobject.UserCO; +import com.zcloud.basic.info.persistence.dataobject.*; import com.zcloud.basic.info.persistence.repository.*; import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.AllArgsConstructor; @@ -87,7 +86,12 @@ public class CorpInfoQueryExe { }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - + public MultiResponse executeListAll(CorpInfoQry corpInfoQry) { + Map params = PageQueryHelper.toHashMap(corpInfoQry); + List corpInfoDOList = corpInfoRepository.listAll(params); + List corpInfoCOList = corpInfoCoConvertor.converDOsToCOs(corpInfoDOList); + return MultiResponse.of(corpInfoCOList); + } public CorpInfoCO info(Long id) { CorpInfoDO corpInfoDO = corpInfoRepository.getById(id); if (corpInfoDO == null){ 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 dba6dc5..62ffa04 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 @@ -1,5 +1,6 @@ package com.zcloud.basic.info.service; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.utils.AuthContext; @@ -9,10 +10,7 @@ import com.zcloud.basic.info.command.*; import com.zcloud.basic.info.command.query.CorpInfoQueryExe; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.dto.*; -import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; -import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.dto.clientobject.CorpInfoEncryCO; -import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; +import com.zcloud.basic.info.dto.clientobject.*; import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -45,6 +43,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { return corpInfoQueryExe.execute(qry); } + @Override + public MultiResponse listAll(CorpInfoQry corpInfoQry) { + return corpInfoQueryExe.executeListAll(corpInfoQry); + } + @Override public SingleResponse add(CorpInfoAddCmd cmd) { corpInfoAddExe.execute(cmd); 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 8f97721..b527e2b 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 @@ -1,13 +1,11 @@ package com.zcloud.basic.info.api; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.security.starter.api.co.DecryptCmd; import com.zcloud.basic.info.dto.*; -import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; -import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.dto.clientobject.CorpInfoEncryCO; -import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; +import com.zcloud.basic.info.dto.clientobject.*; import java.util.Collection; import java.util.List; @@ -21,6 +19,7 @@ import java.util.List; public interface CorpInfoServiceI { PageResponse listPage(CorpInfoPageQry qry); + MultiResponse listAll(CorpInfoQry corpInfoQry); SingleResponse add(CorpInfoAddCmd cmd); Boolean checkCorpCode(CorpInfoCheckCodeQry qry); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java new file mode 100644 index 0000000..94bd9e2 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoQry.java @@ -0,0 +1,129 @@ +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 java.math.BigDecimal; +import java.time.LocalDate; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2025-10-30 15:12:50 + */ +@Data +public class CorpInfoQry { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + + @ApiModelProperty(value = "开户开始时间", name = "geCreateTime", required = true) + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate geCreateTime; + + @ApiModelProperty(value = "开户结束时间", name = "leCreateTime", required = true) + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate leCreateTime; + + @ApiModelProperty(value = "成立开始时间", name = "geCreateDate", required = true) + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate geCreateDate; + + @ApiModelProperty(value = "成立结束时间", name = "leCreateDate", required = true) + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate leCreateDate; + + @ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType") + private Integer eqType; + @ApiModelProperty(value = "企业类型集合，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "inType") + private List inType; + + @ApiModelProperty(value = "启用状态", name = "eqUseFlag") + private Integer eqUseFlag; + +// @ApiModelProperty(value = "企业id", name = "eqCorpinfoId") +// private Long eqCorpinfoId; + @ApiModelProperty(value = "企业名称", name = "likecorpName") + private String likecorpName; + /**、 + * 区分监管、企业、相关方 + * 2025-11-05 罗刚提出将相关方中的普通相关方企业、驻港单位、货主单位合并成同一个列表 + * 1：监管 2：企业 3：相关方 + */ + @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true) + private Integer enterpriseType; + + @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) + private String eqCode; + + @ApiModelProperty(value = "规模", name = "scale", required = true) + private String eqScale; + + @ApiModelProperty(value = "企业状态", name = "corpState", required = true) + private String eqCorpState; + + @ApiModelProperty(value = "资产总额（万元）", name = "totalAssets", required = true) + private BigDecimal eqTotalAssets; + @ApiModelProperty(value = "注册资金（万元）", name = "regcapital", required = true) + private BigDecimal eqRegcapital; + @ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true) + private String eqAddressBusiness; + @ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true) + private String eqAddressOffice; + + @ApiModelProperty(value = "经济类型", name = "ecoType", required = true) + private String eqEcoType; + + @ApiModelProperty(value = "法定代表人", name = "lrName", required = true) + private String eqLrName; + @ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true) + private String eqLrMobile; + @ApiModelProperty(value = "主要负责人", name = "contacts", required = true) + private String eqContacts; + @ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true) + private String eqContactsPhone; + + @ApiModelProperty(value = "行业分类", name = "corpType", required = true) + private String eqcorpType; + + @ApiModelProperty(value = "行业分类", name = "corpType2", required = true) + private String eqCorpType2; + + @ApiModelProperty(value = "行业分类", name = "corpType3", required = true) + private String eqCorpType3; + + @ApiModelProperty(value = "行业分类", name = "corpType4", required = true) + private String eqCorpType4; + + @ApiModelProperty(value = "所属省编码", name = "province", required = true) + private String eqProvince; + + @ApiModelProperty(value = "所属市级编码", name = "city", required = true) + private String eqCity; + + @ApiModelProperty(value = "所属区县编码", name = "country", required = true) + private String eqCountry; + + @ApiModelProperty(value = "所属乡镇编码", name = "village", required = true) + private String eqVillage; + + @ApiModelProperty(value = "所属街道编码", name = "street", required = true) + private String eqStreet; + + private String menuPath; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java index 00a639d..f97136f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java @@ -15,6 +15,7 @@ import java.util.Map; */ public interface CorpInfoRepository extends BaseRepository { PageResponse listPage(Map parmas); + List listAll(Map params); Long getCorpCountByCorpName(String corpName); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index cfdbe73..a984a30 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -77,6 +77,18 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl listAll(Map params) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + List enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")); + if(CollUtil.isNotEmpty(enterpriseType)){ + queryWrapper.in("type",enterpriseType ); + } + queryWrapper.orderByAsc("corp_order").orderByDesc("create_time"); + return corpInfoMapper.selectList(queryWrapper); + } + @Override public Long getCorpCountByCorpName(String corpName) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 2806872..5ffbc5a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -308,7 +308,6 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i if(StringUtils.isEmpty(userDO.getUsername())){ userDO.setUsername(userDO.getPhone()); } - //TODO 流动人员同步gbs需要指定特殊tenantId // if(UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())){ // FacadeUserRegisterCmd facadeUserRegisterCmd = new FacadeUserRegisterCmd();