refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）

liu

3 天以前 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/approval/HrmRegularizeApplicationController.java

@@ -2,7 +2,7 @@

import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationAuditReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmRegularizeApplicationSaveReqVO;
@@ -16,8 +16,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;
import java.util.Set;

import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

@@ -69,23 +68,28 @@
        return success(regularizeApplicationService.getRegularizeApplicationPage(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:regularize:submit')")
    public CommonResult<Boolean> submitRegularizeApplication(@RequestParam("id") Long id,
                                                             @RequestParam("processDefinitionKey") String processDefinitionKey) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        regularizeApplicationService.submitRegularizeApplication(id, processDefinitionKey, userId);
    @PreAuthorize("@ss.hasPermission('hrm:regularize:update')")
    public CommonResult<Boolean> submitRegularizeApplication(@RequestParam("id") Long id) {
        regularizeApplicationService.submitRegularizeApplication(id);
        return success(true);
    }

    @GetMapping("/approve-process-definition-list")
    @Operation(summary = "获取可用的审批流程定义列表")
    @PutMapping("/audit")
    @Operation(summary = "审核（审批中→审核通过/审核不通过），仅审批人本人可操作")
    @PreAuthorize("@ss.hasPermission('hrm:regularize:audit')")
    public CommonResult<Boolean> auditRegularizeApplication(@Valid @RequestBody HrmRegularizeApplicationAuditReqVO auditReqVO) {
        regularizeApplicationService.auditRegularizeApplication(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
        return success(true);
    }

    @GetMapping("/approver-ids")
    @Operation(summary = "获得审批人编号集合，供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('hrm:regularize:query')")
    public CommonResult<List<Map<String, Object>>> getApproveProcessDefinitionList() {
        return success(regularizeApplicationService.getApproveProcessDefinitionList());
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(regularizeApplicationService.getRegularizeApplicationApproverUserIds());
    }

}