From 113e8a56ec922facb3aa95d8095415d51b835e59 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 26 Sep 2022 10:44:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AE=A1=E6=89=B9=E4=BA=BA=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/constants/SystemConstants.java | 5 +++++ .../controller/HrOrgApproverController.java | 12 ++++++++++++ .../service/HrOrgApproverService.java | 10 ++++++++++ .../service/impl/HrOrgApproverServiceImpl.java | 18 ++++++++++++++---- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java index 7b783901e..299cae78a 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java @@ -87,4 +87,9 @@ public interface SystemConstants { */ Long OAUTH2_USER_ROLE_ID = 1339550467939639305L; + /** + * 组织机构审批人类型的菜单 + */ + String APPROVER_TYPE_DICT_TYPE_CODE = "org_approver_type"; + } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java index cee543580..c7f95ff23 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.controller; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -77,4 +78,15 @@ public class HrOrgApproverController { return new SuccessResponseData<>(result); } + /** + * 获取组织机构审批人类型列表 + * + * @author fengshuonan + * @date 2022/9/26 10:44 + */ + @GetResource(name = "获取组织机构审批人类型列表", path = "/hrOrgApprover/getApproverTypeList") + public ResponseData> getApproverTypeList() { + return new SuccessResponseData<>(hrOrgApproverService.getApproverTypeList()); + } + } diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java index e613ca9d0..f97608065 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrgApprover; import cn.stylefeng.roses.kernel.system.modular.organization.pojo.request.HrOrgApproverRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -76,4 +77,13 @@ public interface HrOrgApproverService extends IService { */ List getDeptOrgApprover(Long deptId, Integer orgApproverType, Integer parentLevel); + /** + * 获取所有审批人类型列表 + * + * @return 审批人类型列表 + * @author fengshuonan + * @date 2022/9/26 10:18 + */ + List getApproverTypeList(); + } \ No newline at end of file diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java index 558689976..bd5890c30 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java @@ -1,11 +1,14 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service.impl; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi; import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi; import cn.stylefeng.roses.kernel.system.api.UserServiceApi; -import cn.stylefeng.roses.kernel.system.api.enums.OrgApproverTypeEnum; +import cn.stylefeng.roses.kernel.system.api.constants.SystemConstants; import cn.stylefeng.roses.kernel.system.api.pojo.organization.BindUserItem; import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO; @@ -42,6 +45,8 @@ public class HrOrgApproverServiceImpl extends ServiceImpl getBindingList(HrOrgApproverRequest hrOrgApproverRequest) { // 获取当前系统一共有哪些组织审批人类型 - OrgApproverTypeEnum[] values = OrgApproverTypeEnum.values(); + List approverTypeList = this.getApproverTypeList(); // 先初始化空的绑定情况列表 ArrayList resultList = new ArrayList<>(); - for (OrgApproverTypeEnum orgApproverTypeEnum : values) { + for (SimpleDict orgApproverType : approverTypeList) { HrOrgApprover hrOrgApprover = new HrOrgApprover(); // 设置类型 - hrOrgApprover.setOrgApproverType(orgApproverTypeEnum.getCode()); + hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode())); resultList.add(hrOrgApprover); } @@ -188,6 +193,11 @@ public class HrOrgApproverServiceImpl extends ServiceImpl getApproverTypeList() { + return dictApi.getDictDetailsByDictTypeCode(SystemConstants.APPROVER_TYPE_DICT_TYPE_CODE); + } + /** * 获取信息 *