yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
@@ -5,7 +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.HrmLeaveApplicationAuditReqVO;
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;
@@ -22,7 +22,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;
@@ -75,23 +75,28 @@
        return success(leaveApplicationService.getLeaveApplicationPage(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:leave:submit')")
    public CommonResult<Boolean> submitLeaveApplication(@RequestParam("id") Long id,
                                                         @RequestParam("processDefinitionKey") String processDefinitionKey) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        leaveApplicationService.submitLeaveApplication(id, processDefinitionKey, userId);
    @PreAuthorize("@ss.hasPermission('hrm:leave:update')")
    public CommonResult<Boolean> submitLeaveApplication(@RequestParam("id") Long id) {
        leaveApplicationService.submitLeaveApplication(id);
        return success(true);
    }
    @GetMapping("/approve-process-definition-list")
    @Operation(summary = "获取可用的审批流程定义列表")
    @PutMapping("/audit")
    @Operation(summary = "审核(审批中→审核通过/审核不通过),仅审批人本人可操作")
    @PreAuthorize("@ss.hasPermission('hrm:leave:audit')")
    public CommonResult<Boolean> auditLeaveApplication(@Valid @RequestBody HrmLeaveApplicationAuditReqVO auditReqVO) {
        leaveApplicationService.auditLeaveApplication(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
        return success(true);
    }
    @GetMapping("/approver-ids")
    @Operation(summary = "获得审批人编号集合,供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('hrm:leave:query')")
    public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
        return success(leaveApplicationService.getApproveProcessDefinitionList());
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(leaveApplicationService.getLeaveApplicationApproverUserIds());
    }
    @GetMapping("/export-excel")