!16 优化WfTaskService方法

* fix: 修改接口返回类型
* feat: 增加代办、已办流程变量参数,从而可以实现参数形式关联业务表单
* fix: 优化IService两个方法的返回
This commit is contained in:
lyh2668
2022-04-01 12:08:06 +00:00
committed by KonBAI
parent b5b687f65f
commit a50d46a430
3 changed files with 30 additions and 20 deletions

View File

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.workflow;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.workflow.domain.dto.WfNextDto;
import com.ruoyi.workflow.domain.vo.WfTaskVo;
import com.ruoyi.workflow.domain.bo.WfTaskBo;
import com.ruoyi.workflow.service.IWfTaskService;
@@ -77,7 +78,7 @@ public class WfTaskController {
@ApiOperation(value = "获取流程变量", response = WfTaskVo.class)
@GetMapping(value = "/processVariables/{taskId}")
public R processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) {
return flowTaskService.processVariables(taskId);
return R.ok(flowTaskService.getProcessVariables(taskId));
}
@ApiOperation(value = "审批任务")
@@ -146,7 +147,8 @@ public class WfTaskController {
@ApiOperation(value = "获取下一节点")
@PostMapping(value = "/nextFlowNode")
public R getNextFlowNode(@RequestBody WfTaskBo bo) {
return flowTaskService.getNextFlowNode(bo);
WfNextDto wfNextDto = flowTaskService.getNextFlowNode(bo);
return wfNextDto != null ? R.ok(wfNextDto) : R.ok("流程已完结", null);
}
/**