From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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..1a25d25 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,12 +5,12 @@
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.module.hrm.controller.admin.approval.vo.HrmResignationApplicationAuditReqVO;
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;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +23,7 @@
import java.io.IOException;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -36,8 +36,6 @@
@Resource
private HrmResignationApplicationService resignationApplicationService;
- @Resource
- private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓绂昏亴鐢宠")
@@ -78,23 +76,36 @@
return success(resignationApplicationService.getResignationApplicationPage(pageReqVO));
}
- @PostMapping("/submit")
- @Operation(summary = "鎻愪氦绂昏亴鐢宠瀹℃壒")
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦瀹℃壒锛堣崏绋�/瀹℃牳涓嶉�氳繃鈫掑鎵逛腑锛夛紝瀹℃壒浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟Key", required = true)
- @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());
+ @PreAuthorize("@ss.hasPermission('hrm:resignation:update')")
+ public CommonResult<Boolean> submitResignationApplication(@RequestParam("id") Long id) {
+ resignationApplicationService.submitResignationApplication(id);
return success(true);
}
- @GetMapping("/approve-process-definition-list")
- @Operation(summary = "鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔夊垪琛�")
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳锛堝鎵逛腑鈫掑鏍搁�氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
+ @PreAuthorize("@ss.hasPermission('hrm:resignation:audit')")
+ public CommonResult<Boolean> auditResignationApplication(@Valid @RequestBody HrmResignationApplicationAuditReqVO auditReqVO) {
+ resignationApplicationService.auditResignationApplication(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
@PreAuthorize("@ss.hasPermission('hrm:resignation:query')")
- public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
- return success(resignationApplicationService.getApproveProcessDefinitionList());
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(resignationApplicationService.getResignationApplicationApproverUserIds());
+ }
+
+ @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")
--
Gitblit v1.9.3