From e3c16c62021c97e88c7a9d51aee5b1bb63653430 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@local>
Date: 星期一, 09 十一月 2026 10:00:51 +0800
Subject: [PATCH] feat(hrm): 调岗/离职支持指定申请人,提交免传流程Key,审批通过自动同步员工档案
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
index 2aa674f..4717570 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java
@@ -5,9 +5,11 @@
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationSaveReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationHandoverReqVO;
import cn.iocoder.yudao.module.hrm.service.approval.HrmResignationApplicationService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -81,12 +83,13 @@
@PostMapping("/submit")
@Operation(summary = "鎻愪氦绂昏亴鐢宠瀹℃壒")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key", required = true)
+ @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key锛屼笉浼犲垯鑷姩鍙栬鍒嗙被涓嬫渶鏂扮殑娲昏穬娴佺▼")
@PreAuthorize("@ss.hasPermission('hrm:resignation:submit')")
public CommonResult<Boolean> submitResignationApplication(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- AdminUserRespDTO user = adminUserApi.getUser(1L); // TODO: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- resignationApplicationService.submitResignationApplication(id, processDefinitionKey, user.getId());
+ @RequestParam(value = "processDefinitionKey", required = false)
+ String processDefinitionKey) {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ resignationApplicationService.submitResignationApplication(id, processDefinitionKey, userId);
return success(true);
}
@@ -97,6 +100,14 @@
return success(resignationApplicationService.getApproveProcessDefinitionList());
}
+ @PutMapping("/handover")
+ @Operation(summary = "鏇存柊浜ゆ帴鐘舵��")
+ @PreAuthorize("@ss.hasPermission('hrm:resignation:update')")
+ public CommonResult<Boolean> updateHandoverStatus(@Valid @RequestBody HrmResignationHandoverReqVO reqVO) {
+ resignationApplicationService.updateHandoverStatus(reqVO);
+ return success(true);
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭绂昏亴鐢宠 Excel")
@PreAuthorize("@ss.hasPermission('hrm:resignation:export')")
--
Gitblit v1.9.3