【7.6.0】【sys】【org approver】获取组织机构审批人类型列表

pull/55/MERGE
fengshuonan 2023-06-11 15:03:42 +08:00
parent 9a875f038f
commit 75b8440bfb
5 changed files with 84 additions and 77 deletions

View File

@ -24,6 +24,14 @@
<version>${roses.version}</version>
</dependency>
<!--字典的api-->
<!--获取审批人类型查询-->
<dependency>
<groupId>cn.stylefeng.roses</groupId>
<artifactId>dict-api</artifactId>
<version>${roses.version}</version>
</dependency>
<!--资源api模块-->
<!--用在资源控制器,资源扫描上-->
<dependency>

View File

@ -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.
*
* GunsAPACHE 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";
}

View File

@ -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<HrOrgApprover> 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<HrOrgApprover> 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<HrOrgApprover>> list(HrOrgApproverRequest hrOrgApproverRequest) {
return new SuccessResponseData<>(hrOrgApproverService.findList(hrOrgApproverRequest));
}
/**
*
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@GetResource(name = "分页查询", path = "/hrOrgApprover/page")
public ResponseData<PageResult<HrOrgApprover>> page(HrOrgApproverRequest hrOrgApproverRequest) {
return new SuccessResponseData<>(hrOrgApproverService.findPage(hrOrgApproverRequest));
@GetResource(name = "获取组织机构审批人类型列表", path = "/hrOrgApprover/getApproverTypeList")
public ResponseData<List<SimpleDict>> getApproverTypeList() {
return new SuccessResponseData<>(hrOrgApproverService.getApproverTypeList());
}
}

View File

@ -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<HrOrgApprover> {
/**
/**
*
*
* @param hrOrgApproverRequest
@ -24,7 +25,7 @@ public interface HrOrgApproverService extends IService<HrOrgApprover> {
*/
void add(HrOrgApproverRequest hrOrgApproverRequest);
/**
/**
*
*
* @param hrOrgApproverRequest
@ -33,7 +34,7 @@ public interface HrOrgApproverService extends IService<HrOrgApprover> {
*/
void del(HrOrgApproverRequest hrOrgApproverRequest);
/**
/**
*
*
* @param hrOrgApproverRequest
@ -42,7 +43,7 @@ public interface HrOrgApproverService extends IService<HrOrgApprover> {
*/
void edit(HrOrgApproverRequest hrOrgApproverRequest);
/**
/**
*
*
* @param hrOrgApproverRequest
@ -51,24 +52,33 @@ public interface HrOrgApproverService extends IService<HrOrgApprover> {
*/
HrOrgApprover detail(HrOrgApproverRequest hrOrgApproverRequest);
/**
/**
*
*
* @param hrOrgApproverRequest
* @param hrOrgApproverRequest
* @return List<HrOrgApprover>
* @author fengshuonan
* @date 2023/06/10 21:23
*/
List<HrOrgApprover> findList(HrOrgApproverRequest hrOrgApproverRequest);
/**
/**
*
*
* @param hrOrgApproverRequest
* @param hrOrgApproverRequest
* @return PageResult<HrOrgApprover>
* @author fengshuonan
* @date 2023/06/10 21:23
*/
PageResult<HrOrgApprover> findPage(HrOrgApproverRequest hrOrgApproverRequest);
/**
*
*
* @return
* @author fengshuonan
* @since 2022/9/26 10:18
*/
List<SimpleDict> getApproverTypeList();
}

View File

@ -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<HrOrgApproverMapper, HrOrgApprover> 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<HrOrgApproverMapper, H
return PageResultFactory.createPageResult(sysRolePage);
}
@Override
public List<SimpleDict> getApproverTypeList() {
return dictApi.getDictDetailsByDictTypeCode(ApproverConstants.APPROVER_TYPE_DICT_TYPE_CODE);
}
@Override
public List<HrOrgApprover> findList(HrOrgApproverRequest hrOrgApproverRequest) {
LambdaQueryWrapper<HrOrgApprover> wrapper = this.createWrapper(hrOrgApproverRequest);