From daca8f03f1bb323d66400a02d409826cc38941d5 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 17 Aug 2026 16:55:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(department):=20=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/dto/CorpDepartmentQry.java | 4 ++++ .../com/zcloud/basic/info/dto/DepartmentPageQry.java | 9 +++++++-- .../java/com/zcloud/basic/info/dto/UserPageQry.java | 4 ++-- .../zcloud/basic/info/domain/enums/CorpTypeEnum.java | 2 +- .../repository/impl/DepartmentRepositoryImpl.java | 12 +++++++++++- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java index 40bf6d72..e4699694 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java @@ -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; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java index 364b0f26..dac98652 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java @@ -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") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index 35e8ac4e..0393f448 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -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; 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 4fdcf546..759cde8c 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 @@ -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> ENTERPRISE_TYPE_CODE_MAP = new HashMap<>(); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 60294e3e..0c1c86f3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -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 listPage(Map parmas) { IPage iPage = new Query().getPage(parmas); + Map queryParams = new HashMap<>(parmas); + String likeLeaderName = (String) queryParams.remove("likeLeaderName"); QueryWrapper 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"))){