DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 调整办公管理模块接口

Browse Source
This commit is contained in:
konbai
2022-04-04 17:59:06 +08:00
parent 0858f853df
commit b51c4d91fd
16 changed files with 189 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDefinitionController.java
View File

@@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Map;
/**
* 工作流程定义
@@ -122,17 +121,6 @@ public class WfDefinitionController extends BaseController {
return R.ok("导入成功");
}
@Deprecated
@ApiOperation(value = "根据流程定义id启动流程实例")
@SaCheckPermission("workflow:definition:start")
@PostMapping("/start/{procDefId}")
public R<Void> start(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId,
@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) {
flowDefinitionService.startProcessInstanceById(procDefId, variables);
return R.ok("流程启动成功");
}
@ApiOperation(value = "激活或挂起流程定义")
@SaCheckPermission("workflow:definition:update")
@PutMapping(value = "/updateState")

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java
View File

@@ -50,8 +50,23 @@ public class WfProcessController extends BaseController {
}
@ApiOperation(value = "我拥有的流程", response = WfTaskVo.class)
@GetMapping(value = "/own")
@SaCheckPermission("workflow:process:ownList")
@GetMapping(value = "/ownList")
public TableDataInfo<WfTaskVo> ownProcess(PageQuery pageQuery) {
return processService.queryPageOwnProcessList(pageQuery);
}
@ApiOperation(value = "获取待办列表", response = WfTaskVo.class)
@SaCheckPermission("workflow:process:todoList")
@GetMapping(value = "/todoList")
public TableDataInfo<WfTaskVo> todoProcess(PageQuery pageQuery) {
return processService.queryPageTodoProcessList(pageQuery);
}
@ApiOperation(value = "获取已办列表", response = WfTaskVo.class)
@SaCheckPermission("workflow:process:finishedList")
@GetMapping(value = "/finishedList")
public TableDataInfo<WfTaskVo> finishedProcess(PageQuery pageQuery) {
return processService.queryPageFinishedProcessList(pageQuery);
}
}

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java
View File

@@ -37,13 +37,6 @@ public class WfTaskController {
private final IWfTaskService flowTaskService;
@Deprecated
@ApiOperation(value = "我发起的流程", response = WfTaskVo.class)
@GetMapping(value = "/myProcess")
public TableDataInfo<WfTaskVo> myProcess(PageQuery pageQuery) {
return flowTaskService.myProcess(pageQuery);
}
@ApiOperation(value = "取消申请", response = WfTaskVo.class)
@PostMapping(value = "/stopProcess")
public R stopProcess(@RequestBody WfTaskBo bo) {
@@ -58,6 +51,7 @@ public class WfTaskController {
return R.ok();
}
@Deprecated
@ApiOperation(value = "获取待办列表", response = WfTaskVo.class)
@GetMapping(value = "/todoList")
public TableDataInfo<WfTaskVo> todoList(PageQuery pageQuery) {
@@ -71,13 +65,6 @@ public class WfTaskController {
return flowTaskService.finishedList(pageQuery);
}
@ApiOperation(value = "流程历史流转记录", response = WfTaskVo.class)
@GetMapping(value = "/flowRecord")
public R flowRecord(String procInsId, String deployId) {
return R.ok(flowTaskService.flowRecord(procInsId, deployId));
}
@ApiOperation(value = "获取流程变量", response = WfTaskVo.class)
@GetMapping(value = "/processVariables/{taskId}")
public R processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) {