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/HrmTransferApplicationController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
index a700a2f..74220f5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmTransferApplicationController.java
@@ -5,6 +5,7 @@
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.HrmTransferApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmTransferApplicationSaveReqVO;
@@ -85,12 +86,21 @@
@PreAuthorize("@ss.hasPermission('hrm:transfer:submit')")
public CommonResult<Boolean> submitTransferApplication(@RequestParam("id") Long id,
@RequestParam("processDefinitionKey") String processDefinitionKey) {
- AdminUserRespDTO user = adminUserApi.getUser(1L); // TODO: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- transferApplicationService.submitTransferApplication(id, processDefinitionKey, user.getId());
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ transferApplicationService.submitTransferApplication(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:transfer:cancel')")
+ public CommonResult<Boolean> cancelTransferApplication(@RequestParam("id") Long id) {
+ transferApplicationService.cancel(id, SecurityFrameworkUtils.getLoginUserId());
+ return success(true);
+ }
+
+@GetMapping("/approve-process-definition-list")
@Operation(summary = "鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔夊垪琛�")
@PreAuthorize("@ss.hasPermission('hrm:transfer:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
--
Gitblit v1.9.3