add 添加节点审批记录，调整流程驳回

gssong

2024-03-17 5360ec6ec3bf356a554df624e884a0bb1090fa4b

 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java

@@ -1,5 +1,6 @@
package org.dromara.workflow.controller;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
@@ -12,10 +13,12 @@
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.WfTaskBackNode;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.TaskVo;
import org.dromara.workflow.domain.vo.VariableVo;
import org.dromara.workflow.service.IActTaskService;
import org.dromara.workflow.service.IWfTaskBackNodeService;
import org.dromara.workflow.utils.QueryUtils;
import org.flowable.engine.TaskService;
import org.springframework.validation.annotation.Validated;
@@ -23,7 +26,6 @@

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

/**
 * 任务管理 控制层
@@ -39,6 +41,8 @@
    private final IActTaskService actTaskService;

    private final TaskService taskService;

    private final IWfTaskBackNodeService iWfTaskBackNodeService;


    /**
@@ -220,7 +224,7 @@
    @Log(title = "任务管理", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping("/backProcess")
    public R<String> backProcess(@RequestBody BackProcessBo backProcessBo) {
    public R<String> backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo backProcessBo) {
        return R.ok(actTaskService.backProcess(backProcessBo));
    }

@@ -264,7 +268,7 @@
     * @param processInstanceId 流程实例id
     */
    @GetMapping("/getTaskNodeList/{processInstanceId}")
    public R<Set<TaskVo>> getNodeList(@PathVariable String processInstanceId) {
        return R.ok(actTaskService.getTaskNodeList(processInstanceId));
    public R<List<WfTaskBackNode>> getNodeList(@PathVariable String processInstanceId) {
        return R.ok(CollUtil.reverse(iWfTaskBackNodeService.getListByInstanceId(processInstanceId)));
    }
}