From defe1e1c3ade87de0a7990f565f08f93aeb2decc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 19:31:46 +0800
Subject: [PATCH] fix(bpm): 统一审批标题单号并收紧各模块提交校验
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
index f362ce9..383bd10 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
@@ -5,12 +5,13 @@
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.HrmLeaveApplicationImportExcelVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationImportRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmLeaveApplicationSaveReqVO;
import cn.iocoder.yudao.module.hrm.service.approval.HrmLeaveApplicationService;
-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;
@@ -20,6 +21,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
@@ -36,8 +38,6 @@
@Resource
private HrmLeaveApplicationService leaveApplicationService;
- @Resource
- private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璇峰亣鐢宠")
@@ -66,14 +66,12 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璇峰亣鐢宠璇︽儏")
@Parameter(name = "id", description = "鐢宠ID", required = true)
- @PreAuthorize("@ss.hasPermission('hrm:leave:query')")
public CommonResult<HrmLeaveApplicationRespVO> getLeaveApplication(@RequestParam("id") Long id) {
return success(leaveApplicationService.getLeaveApplicationDetail(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱璇峰亣鐢宠鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('hrm:leave:query')")
public CommonResult<PageResult<HrmLeaveApplicationRespVO>> getLeaveApplicationPage(@Valid HrmLeaveApplicationPageReqVO pageReqVO) {
return success(leaveApplicationService.getLeaveApplicationPage(pageReqVO));
}
@@ -85,19 +83,43 @@
@PreAuthorize("@ss.hasPermission('hrm:leave:submit')")
public CommonResult<Boolean> submitLeaveApplication(@RequestParam("id") Long id,
@RequestParam("processDefinitionKey") String processDefinitionKey) {
- // 鑾峰彇褰撳墠鐢ㄦ埛ID
- AdminUserRespDTO user = adminUserApi.getUser(1L); // TODO: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- leaveApplicationService.submitLeaveApplication(id, processDefinitionKey, user.getId());
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ leaveApplicationService.submitLeaveApplication(id, processDefinitionKey, userId);
return success(true);
}
@GetMapping("/approve-process-definition-list")
@Operation(summary = "鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔夊垪琛�")
- @PreAuthorize("@ss.hasPermission('hrm:leave:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
return success(leaveApplicationService.getApproveProcessDefinitionList());
}
+ @GetMapping("/import-template")
+ @Operation(summary = "涓嬭浇璇峰亣鐢宠瀵煎叆妯℃澘")
+ @PreAuthorize("@ss.hasPermission('hrm:leave:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ HrmLeaveApplicationImportExcelVO example = new HrmLeaveApplicationImportExcelVO();
+ example.setPhone("13800138000");
+ example.setEmployeeName("寮犱笁");
+ example.setLeaveTypeName("浜嬪亣");
+ example.setStartTime("2026-11-10 09:00");
+ example.setEndTime("2026-11-10 18:00");
+ example.setDuration("1");
+ example.setReason("涓汉浜嬪姟");
+ example.setRemark("绀轰緥琛岋紝瀵煎叆鍓嶈鍒犻櫎");
+ ExcelUtils.write(response, "璇峰亣鐢宠瀵煎叆妯℃澘.xls", "璇峰亣鐢宠", HrmLeaveApplicationImportExcelVO.class,
+ List.of(example));
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆璇峰亣鐢宠锛堜粎鐢熸垚鑽夌锛屼笉鑷姩鎻愪氦瀹℃壒锛�")
+ @PreAuthorize("@ss.hasPermission('hrm:leave:import')")
+ public CommonResult<HrmLeaveApplicationImportRespVO> importExcel(@RequestParam("file") MultipartFile file)
+ throws IOException {
+ List<HrmLeaveApplicationImportExcelVO> list = ExcelUtils.read(file, HrmLeaveApplicationImportExcelVO.class);
+ return success(leaveApplicationService.importLeaveApplications(list));
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭璇峰亣鐢宠 Excel")
@PreAuthorize("@ss.hasPermission('hrm:leave:export')")
--
Gitblit v1.9.3