Merge remote-tracking branch 'origin/master'

luohairen

2024-12-10 b24e024f386e7f25a071b58e9267a2c19f20ba1e

 flowable/src/main/java/com/ycl/controller/FlowTaskController.java

@@ -7,6 +7,7 @@
import com.ycl.domain.dto.FlowTaskDto;
import com.ycl.domain.vo.FlowQueryVo;
import com.ycl.domain.vo.FlowTaskVo;
import com.ycl.domain.vo.FormDetailVO;
import com.ycl.service.IFlowTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,6 +23,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;

/**
 * <p>工作流任务管理<p>
@@ -84,7 +86,7 @@
    }


    @ApiOperation(value = "流程初始化表单", response = FlowTaskDto.class)
    @ApiOperation(value = "获取流程关联的表单", response = FlowTaskDto.class)
    @GetMapping(value = "/flowFormData")
    public AjaxResult flowFormData(String deployId) {
        return flowTaskService.flowFormData(deployId);
@@ -96,7 +98,22 @@
        return flowTaskService.processVariables(taskId);
    }

    @ApiOperation(value = "审批任务")
    @ApiOperation(value = "查看任务", response = FormDetailVO.class)
    @GetMapping(value = "/detail/{taskId}")
    public AjaxResult detail(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) {
        return flowTaskService.detail(taskId);
    }


    @ApiOperation(value = "完成提交表单任务/普通提交")
    @Log(title = "完成提交表单任务/普通提交", businessType = BusinessType.INSERT)
    @PostMapping("/complete/form/{taskId}")
    public AjaxResult completeSubmitForm(@ApiParam(value = "流程定义id") @PathVariable(value = "taskId") String taskId,
                            @ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
        return flowTaskService.completeSubmitForm(taskId, variables);
    }

    @ApiOperation(value = "完成审批任务")
    @Log(title = "审批任务", businessType = BusinessType.UPDATE)
    @PostMapping(value = "/complete")
    public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) {