From 75b8440bfb3a6f6182e5862f719b553aaa8ebd33 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 11 Jun 2023 15:03:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90org=20approver=E3=80=91=E8=8E=B7=E5=8F=96=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=AE=A1=E6=89=B9=E4=BA=BA=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-s-sys/sys-business-hr/pom.xml | 8 ++ .../org/constants/ApproverConstants.java | 40 ++++++++++ .../controller/HrOrgApproverController.java | 75 ++----------------- .../org/service/HrOrgApproverService.java | 26 +++++-- .../impl/HrOrgApproverServiceImpl.java | 12 +++ 5 files changed, 84 insertions(+), 77 deletions(-) create mode 100644 kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/constants/ApproverConstants.java diff --git a/kernel-s-sys/sys-business-hr/pom.xml b/kernel-s-sys/sys-business-hr/pom.xml index 92e2ed27b..e45ecb134 100644 --- a/kernel-s-sys/sys-business-hr/pom.xml +++ b/kernel-s-sys/sys-business-hr/pom.xml @@ -24,6 +24,14 @@ ${roses.version} + + + + cn.stylefeng.roses + dict-api + ${roses.version} + + diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/constants/ApproverConstants.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/constants/ApproverConstants.java new file mode 100644 index 000000000..4edf5a39b --- /dev/null +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/constants/ApproverConstants.java @@ -0,0 +1,40 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处，作者声明等。 + * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点，可申请商业授权 + */ +package cn.stylefeng.roses.kernel.sys.modular.org.constants; + +/** + * 审批人的常量列表 + * + * @author fengshuonan + * @since 2023/6/11 15:02 + */ +public interface ApproverConstants { + + /** + * 组织机构审批人类型的字典类型编码 + */ + String APPROVER_TYPE_DICT_TYPE_CODE = "org_approver_type"; + +} diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java index 2133794ae..89fa4585f 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java @@ -1,16 +1,11 @@ package cn.stylefeng.roses.kernel.sys.modular.org.controller; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +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; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; -import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; -import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrgApprover; -import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.HrOrgApproverRequest; import cn.stylefeng.roses.kernel.sys.modular.org.service.HrOrgApproverService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -30,72 +25,14 @@ public class HrOrgApproverController { private HrOrgApproverService hrOrgApproverService; /** - * 添加 + * 获取组织机构审批人类型列表 * * @author fengshuonan - * @date 2023/06/10 21:23 + * @since 2022/9/26 10:44 */ - @PostResource(name = "添加", path = "/hrOrgApprover/add") - public ResponseData add(@RequestBody @Validated(HrOrgApproverRequest.add.class) HrOrgApproverRequest hrOrgApproverRequest) { - hrOrgApproverService.add(hrOrgApproverRequest); - return new SuccessResponseData<>(); - } - - /** - * 删除 - * - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - @PostResource(name = "删除", path = "/hrOrgApprover/delete") - public ResponseData delete(@RequestBody @Validated(HrOrgApproverRequest.delete.class) HrOrgApproverRequest hrOrgApproverRequest) { - hrOrgApproverService.del(hrOrgApproverRequest); - return new SuccessResponseData<>(); - } - - /** - * 编辑 - * - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - @PostResource(name = "编辑", path = "/hrOrgApprover/edit") - public ResponseData edit(@RequestBody @Validated(HrOrgApproverRequest.edit.class) HrOrgApproverRequest hrOrgApproverRequest) { - hrOrgApproverService.edit(hrOrgApproverRequest); - return new SuccessResponseData<>(); - } - - /** - * 查看详情 - * - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - @GetResource(name = "查看详情", path = "/hrOrgApprover/detail") - public ResponseData detail(@Validated(HrOrgApproverRequest.detail.class) HrOrgApproverRequest hrOrgApproverRequest) { - return new SuccessResponseData<>(hrOrgApproverService.detail(hrOrgApproverRequest)); - } - - /** - * 获取列表 - * - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - @GetResource(name = "获取列表", path = "/hrOrgApprover/list") - public ResponseData> list(HrOrgApproverRequest hrOrgApproverRequest) { - return new SuccessResponseData<>(hrOrgApproverService.findList(hrOrgApproverRequest)); - } - - /** - * 获取列表（带分页） - * - * @author fengshuonan - * @date 2023/06/10 21:23 - */ - @GetResource(name = "分页查询", path = "/hrOrgApprover/page") - public ResponseData> page(HrOrgApproverRequest hrOrgApproverRequest) { - return new SuccessResponseData<>(hrOrgApproverService.findPage(hrOrgApproverRequest)); + @GetResource(name = "获取组织机构审批人类型列表", path = "/hrOrgApprover/getApproverTypeList") + public ResponseData> getApproverTypeList() { + return new SuccessResponseData<>(hrOrgApproverService.getApproverTypeList()); } } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java index 849c25129..79b4ef2cd 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrgApproverService.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.org.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrgApprover; import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.HrOrgApproverRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -15,7 +16,7 @@ import java.util.List; */ public interface HrOrgApproverService extends IService { - /** + /** * 新增 * * @param hrOrgApproverRequest 请求参数 @@ -24,7 +25,7 @@ public interface HrOrgApproverService extends IService { */ void add(HrOrgApproverRequest hrOrgApproverRequest); - /** + /** * 删除 * * @param hrOrgApproverRequest 请求参数 @@ -33,7 +34,7 @@ public interface HrOrgApproverService extends IService { */ void del(HrOrgApproverRequest hrOrgApproverRequest); - /** + /** * 编辑 * * @param hrOrgApproverRequest 请求参数 @@ -42,7 +43,7 @@ public interface HrOrgApproverService extends IService { */ void edit(HrOrgApproverRequest hrOrgApproverRequest); - /** + /** * 查询详情 * * @param hrOrgApproverRequest 请求参数 @@ -51,24 +52,33 @@ public interface HrOrgApproverService extends IService { */ HrOrgApprover detail(HrOrgApproverRequest hrOrgApproverRequest); - /** + /** * 获取列表 * - * @param hrOrgApproverRequest 请求参数 + * @param hrOrgApproverRequest 请求参数 * @return List 返回结果 * @author fengshuonan * @date 2023/06/10 21:23 */ List findList(HrOrgApproverRequest hrOrgApproverRequest); - /** + /** * 获取列表（带分页） * - * @param hrOrgApproverRequest 请求参数 + * @param hrOrgApproverRequest 请求参数 * @return PageResult 返回结果 * @author fengshuonan * @date 2023/06/10 21:23 */ PageResult findPage(HrOrgApproverRequest hrOrgApproverRequest); + /** + * 获取所有审批人类型列表 + * + * @return 审批人类型列表 + * @author fengshuonan + * @since 2022/9/26 10:18 + */ + List getApproverTypeList(); + } \ No newline at end of file diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java index 73d6b7cb3..f027bd1d2 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java @@ -5,8 +5,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +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.sys.api.callback.RemoveOrgCallbackApi; +import cn.stylefeng.roses.kernel.sys.modular.org.constants.ApproverConstants; import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrgApprover; import cn.stylefeng.roses.kernel.sys.modular.org.enums.HrOrgApproverExceptionEnum; import cn.stylefeng.roses.kernel.sys.modular.org.mapper.HrOrgApproverMapper; @@ -18,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; import java.util.Set; @@ -30,6 +34,9 @@ import java.util.Set; @Service public class HrOrgApproverServiceImpl extends ServiceImpl implements HrOrgApproverService, RemoveOrgCallbackApi { + @Resource + private DictApi dictApi; + @Override public void add(HrOrgApproverRequest hrOrgApproverRequest) { HrOrgApprover hrOrgApprover = new HrOrgApprover(); @@ -62,6 +69,11 @@ public class HrOrgApproverServiceImpl extends ServiceImpl getApproverTypeList() { + return dictApi.getDictDetailsByDictTypeCode(ApproverConstants.APPROVER_TYPE_DICT_TYPE_CODE); + } + @Override public List findList(HrOrgApproverRequest hrOrgApproverRequest) { LambdaQueryWrapper wrapper = this.createWrapper(hrOrgApproverRequest);