gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【sys】【org】更新审批人查询条件

pull/55/MERGE
fengshuonan 2023-06-11 14:57:01 +08:00
parent 814e94e3a3
commit 9a875f038f
3 changed files with 5 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/bak/HrOrgApproverController.java → kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/HrOrgApproverController.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.sys.modular.org.controller.bak;
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.response.ResponseData;

101
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/bak/HrOrganizationController.java
View File

@ -1,101 +0,0 @@
package cn.stylefeng.roses.kernel.sys.modular.org.controller.bak;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
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.HrOrganization;
import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.HrOrganizationRequest;
import cn.stylefeng.roses.kernel.sys.modular.org.service.HrOrganizationService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* 组织机构信息控制器
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@RestController
@ApiResource(name = "组织机构信息")
public class HrOrganizationController {
@Resource
private HrOrganizationService hrOrganizationService;
/**
* 添加
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@PostResource(name = "添加", path = "/hrOrganization/add")
public ResponseData<HrOrganization> add(@RequestBody @Validated(HrOrganizationRequest.add.class) HrOrganizationRequest hrOrganizationRequest) {
hrOrganizationService.add(hrOrganizationRequest);
return new SuccessResponseData<>();
}
/**
* 删除
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@PostResource(name = "删除", path = "/hrOrganization/delete")
public ResponseData<?> delete(@RequestBody @Validated(HrOrganizationRequest.delete.class) HrOrganizationRequest hrOrganizationRequest) {
hrOrganizationService.del(hrOrganizationRequest);
return new SuccessResponseData<>();
}
/**
* 编辑
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@PostResource(name = "编辑", path = "/hrOrganization/edit")
public ResponseData<?> edit(@RequestBody @Validated(HrOrganizationRequest.edit.class) HrOrganizationRequest hrOrganizationRequest) {
hrOrganizationService.edit(hrOrganizationRequest);
return new SuccessResponseData<>();
}
/**
* 查看详情
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@GetResource(name = "查看详情", path = "/hrOrganization/detail")
public ResponseData<HrOrganization> detail(@Validated(HrOrganizationRequest.detail.class) HrOrganizationRequest hrOrganizationRequest) {
return new SuccessResponseData<>(hrOrganizationService.detail(hrOrganizationRequest));
}
/**
* 获取列表
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@GetResource(name = "获取列表", path = "/hrOrganization/list")
public ResponseData<List<HrOrganization>> list(HrOrganizationRequest hrOrganizationRequest) {
return new SuccessResponseData<>(hrOrganizationService.findList(hrOrganizationRequest));
}
/**
* 获取列表（带分页）
*
* @author fengshuonan
* @date 2023/06/10 21:23
*/
@GetResource(name = "分页查询", path = "/hrOrganization/page")
public ResponseData<PageResult<HrOrganization>> page(HrOrganizationRequest hrOrganizationRequest) {
return new SuccessResponseData<>(hrOrganizationService.findPage(hrOrganizationRequest));
}
}

12
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrgApproverServiceImpl.java
View File

@ -103,17 +103,13 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
private LambdaQueryWrapper<HrOrgApprover> createWrapper(HrOrgApproverRequest hrOrgApproverRequest) {
LambdaQueryWrapper<HrOrgApprover> queryWrapper = new LambdaQueryWrapper<>();
Long orgApproverId = hrOrgApproverRequest.getOrgApproverId();
// 根据审批人类型查询
Integer orgApproverType = hrOrgApproverRequest.getOrgApproverType();
Long orgId = hrOrgApproverRequest.getOrgId();
Long userId = hrOrgApproverRequest.getUserId();
Long tenantId = hrOrgApproverRequest.getTenantId();
queryWrapper.eq(ObjectUtil.isNotNull(orgApproverId), HrOrgApprover::getOrgApproverId, orgApproverId);
queryWrapper.eq(ObjectUtil.isNotNull(orgApproverType), HrOrgApprover::getOrgApproverType, orgApproverType);
// 根据组织机构id查询
Long orgId = hrOrgApproverRequest.getOrgId();
queryWrapper.eq(ObjectUtil.isNotNull(orgId), HrOrgApprover::getOrgId, orgId);
queryWrapper.eq(ObjectUtil.isNotNull(userId), HrOrgApprover::getUserId, userId);
queryWrapper.eq(ObjectUtil.isNotNull(tenantId), HrOrgApprover::getTenantId, tenantId);
return queryWrapper;
}