From f67b69ed044ed4bf78cb17cf7727ab2aad25afc6 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 6 Nov 2025 09:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/dto/CorpInfoPageQry.java | 2 +- .../basic/info/dto/DepartmentAddCmd.java | 4 +- .../basic/info/domain/enums/CorpTypeEnum.java | 40 +++++++++++++++---- .../impl/CorpInfoRepositoryImpl.java | 9 +---- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java index 2a42f18..956502a 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java @@ -32,6 +32,6 @@ public class CorpInfoPageQry extends PageQuery { * 2025-11-05 罗刚提出将相关方中的普通相关方企业、驻港单位、货主单位合并成同一个列表 * 0：监管 1：企业 2：相关方 */ - private String enterpriseType; + private Integer enterpriseType; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java index b2f8bb8..693d248 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java @@ -29,10 +29,10 @@ public class DepartmentAddCmd extends Command { @NotEmpty(message = "名称不能为空") private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) -// @NotNull(message = "父部门id不能为空") + @NotNull(message = "父部门id不能为空") private Long parentId; - @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) + @ApiModelProperty(value = "所属企业", name = "corpinfoId") private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) @NotEmpty(message = "部门级别编码不能为空") diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java index 4dde900..c02ac78 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java @@ -2,22 +2,48 @@ package com.zcloud.basic.info.domain.enums; import lombok.Getter; +import java.util.*; +import java.util.stream.Collectors; + +/** + * corp_info 中的type字段枚举(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + * 与传入enterpriseType中的关联关系 + */ @Getter public enum CorpTypeEnum { - OrdinaryEnterprises(0,"普通企业"), - groupUnits(1, "集团单位"), - share(2,"股份单位"), - serviceProvider(3, "相关方企业"), - cargoOwner(4, "货主单位"), - portUnit(5, "驻港单位"); + OrdinaryEnterprises(0,"普通企业",1), + groupUnits(1, "集团单位",0), + share(2,"股份单位",1), + serviceProvider(3, "相关方企业",2), + cargoOwner(4, "货主单位",2), + portUnit(5, "驻港单位",2); + private static final Map> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>(); private final Integer code; private final String name; + //传入的企业类型 0：监管 1：企业 2：相关方 + private final Integer enterpriseType; - CorpTypeEnum(Integer code, String name) { + CorpTypeEnum(Integer code, String name,Integer enterpriseType) { this.code = code; this.name = name; + this.enterpriseType = enterpriseType; + } + static { + Arrays.stream(CorpTypeEnum.values()) + .collect(Collectors.groupingBy(CorpTypeEnum::getEnterpriseType)) + .forEach((enterpriseType, corpTypes) -> + ENTERPRISE_TYPE_CODE_MAP.put( + enterpriseType, + corpTypes.stream().map(CorpTypeEnum::getCode).collect(Collectors.toList()) + ) + ); } + public static List getCodesByEnterpriseType(Integer enterpriseType) { + return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList()); + } + + } 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 a4f19dd..974833b 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.mapper.CorpInfoMapper; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; @@ -34,13 +35,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - if ("0".equals(params.get("enterpriseType"))){ - queryWrapper.eq("type", "2"); - } else if ("1".equals(params.get("enterpriseType"))) { - queryWrapper.in("type", Arrays.asList("0", "1")); - }else { - queryWrapper.in("type", Arrays.asList("3", "4","5")); - } + queryWrapper.in("type", CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"))); IPage result = corpInfoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); }