xiaoyi
8 天以前 68317d44b233f28150336bbf3aa3a32400552437
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmLeaveApplicationController.java
@@ -5,12 +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.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;
@@ -36,8 +35,6 @@
    @Resource
    private HrmLeaveApplicationService leaveApplicationService;
    @Resource
    private AdminUserApi adminUserApi;
    @PostMapping("/create")
    @Operation(summary = "创建请假申请")
@@ -85,13 +82,21 @@
    @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")
        @PostMapping("/cancel")
    @Operation(summary = "撤销申请")
    @Parameter(name = "id", description = "申请ID", required = true)
    @PreAuthorize("@ss.hasPermission('hrm:leave:cancel')")
    public CommonResult<Boolean> cancelLeaveApplication(@RequestParam("id") Long id) {
        leaveApplicationService.cancel(id, SecurityFrameworkUtils.getLoginUserId());
        return success(true);
    }
@GetMapping("/approve-process-definition-list")
    @Operation(summary = "获取可用的审批流程定义列表")
    @PreAuthorize("@ss.hasPermission('hrm:leave:query')")
    public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {