From 68317d44b233f28150336bbf3aa3a32400552437 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 02 十一月 2026 11:02:08 +0800
Subject: [PATCH] fix(excel): 导入模板日期改为文本显示，修复显示为 Excel 序列号
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmResignationApplicationController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 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 2aa674f..b606167 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;
@@ -85,18 +87,35 @@
@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());
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ resignationApplicationService.submitResignationApplication(id, processDefinitionKey, userId);
return success(true);
}
- @GetMapping("/approve-process-definition-list")
+ @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.cancel(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