From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 d4261f8..39fab74 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
@@ -9,6 +9,7 @@
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;
@@ -67,14 +68,12 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱绂昏亴鐢宠璇︽儏")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:resignation:query')")
public CommonResult<HrmResignationApplicationRespVO> getResignationApplication(@RequestParam("id") Long id) {
return success(resignationApplicationService.getResignationApplicationDetail(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱绂昏亴鐢宠鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:resignation:query')")
public CommonResult<PageResult<HrmResignationApplicationRespVO>> getResignationApplicationPage(@Valid HrmResignationApplicationPageReqVO pageReqVO) {
return success(resignationApplicationService.getResignationApplicationPage(pageReqVO));
}
@@ -91,13 +90,30 @@
return success(true);
}
+ @PostMapping("/cancel")
+ @Operation(summary = "鎾ら攢绂昏亴鐢宠")
+ @Parameter(name = "id", description = "鐢宠ID", required = true)
+ @PreAuthorize("@ss.hasPermission('hrm:resignation:cancel')")
+ public CommonResult<Boolean> cancelResignationApplication(@RequestParam("id") Long id) {
+ resignationApplicationService.cancelResignationApplication(id,
+ SecurityFrameworkUtils.getLoginUserId());
+ return success(true);
+ }
+
@GetMapping("/approve-process-definition-list")
@Operation(summary = "鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔夊垪琛�")
- @PreAuthorize("@ss.hasPermission('hrm:resignation:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
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