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

feat(department): 添加部门查询功能增强

dev_change_0814
zhaokai 2026-08-17 16:55:21 +08:00
parent 47ebd5c6d7
commit daca8f03f1
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,10 @@ public class CorpDepartmentQry extends PageQuery {
@ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "eqUseFlag")
private String eqUseFlag;
@ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType")
private String eqType;
@ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true)
private Integer enterpriseType;

9
web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java
View File

@ -27,10 +27,15 @@ public class DepartmentPageQry extends PageQuery {
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
/**
* 名称模糊查询
* 部门名称模糊查询
*/
@ApiModelProperty(value = "名称模糊查询", name = "likeName")
@ApiModelProperty(value = "部门名称模糊查询", name = "likeName")
private String likeName;
/**
* 负责人名称模糊查询
*/
@ApiModelProperty(value = "负责人名称模糊查询", name = "likeLeaderName")
private String likeLeaderName;
@ApiModelProperty(value = "企业id", name = "eqCorpInfoId")
private Long eqCorpinfoId;
@ApiModelProperty(value = "父id", name = "eqParentId")

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

@ -34,11 +34,11 @@ public class UserPageQry extends PageQuery {
private Long[] inDepartmentId;
@ApiModelProperty(value = "岗位id")
private Long eqPostId;
@ApiModelProperty(value = "角色id")
@ApiModelProperty(value = "用户角色id（精确查询）", name = "eqRoleId")
private Long eqRoleId;
@ApiModelProperty(value = "入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核")
private Integer eqEmploymentFlag;
@ApiModelProperty(value = "姓名模糊搜索")
@ApiModelProperty(value = "姓名（模糊查询）", name = "likeName")
private String likeName;
@ApiModelProperty(value = "账号模糊搜索")
private String likeUsername;

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

@ -19,7 +19,7 @@ public enum CorpTypeEnum {
share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"),
serviceProvider(3, "相关方企业",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
cargoOwner(4, "货主单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
portUnit(5, "驻港单位",UserTypeEnum.XGF.getCode(), "Cc@12345678"),
portUnit(5, "驻港单位",UserTypeEnum.QY.getCode(), "Bb@12345678"),
materialCenter(6, "物资中心",UserTypeEnum.QY.getCode(), "Bb@12345678");
private static final Map<Integer, List<Integer>> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>();

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

@ -23,6 +23,7 @@ import com.zcloud.basic.info.utils.Query;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Tools;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -45,8 +46,17 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
@Override
public PageResponse<DepartmentDO> listPage(Map<String, Object> parmas) {
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
Map<String, Object> queryParams = new HashMap<>(parmas);
String likeLeaderName = (String) queryParams.remove("likeLeaderName");
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, queryParams);
if (StringUtils.isNotBlank(likeLeaderName)) {
queryWrapper.apply("EXISTS (SELECT 1 FROM user u " +
"WHERE u.department_id = department.id " +
"AND u.delete_enum = 'FALSE' " +
"AND u.department_leader_flag = '1' " +
"AND u.name LIKE CONCAT('%', {0}, '%'))", likeLeaderName.trim());
}
queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
String menuPerms = "";
if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))){