zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改企业查询

main
zhaokai 2025-11-06 09:44:51 +08:00
parent 18c98da1f2
commit f67b69ed04
4 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java
View File

@ -32,6 +32,6 @@ public class CorpInfoPageQry extends PageQuery {
* 2025-11-05 罗刚提出将相关方中的普通相关方企业、驻港单位、货主单位合并成同一个列表
* 0：监管 1：企业 2：相关方
*/
private String enterpriseType;
private Integer enterpriseType;
}

4
web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java
View File

@ -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 = "部门级别编码不能为空")

40
web-domain/src/main/java/com/zcloud/basic/info/domain/enums/CorpTypeEnum.java
View File

@ -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<Integer, List<Integer>> 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<Integer> getCodesByEnterpriseType(Integer enterpriseType) {
return ENTERPRISE_TYPE_CODE_MAP.getOrDefault(enterpriseType, Collections.emptyList());
}
}

9
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java
View File

@ -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<CorpInfoMapper, C
IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
QueryWrapper<CorpInfoDO> 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<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());
}