diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 0d802d3c5..8178b9604 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -129,9 +129,9 @@ public class FlwDefinitionController extends BaseController { * @param id 流程定义id */ @Log(title = "流程定义", businessType = BusinessType.INSERT) - @PostMapping("/copyDef/{id}") + @PostMapping("/copy/{id}") @Transactional(rollbackFor = Exception.class) - public R copyDef(@PathVariable Long id) { + public R copy(@PathVariable Long id) { return R.ok(defService.copyDef(id)); } @@ -141,9 +141,9 @@ public class FlwDefinitionController extends BaseController { * @param file 文件 */ @Log(title = "流程定义", businessType = BusinessType.IMPORT) - @PostMapping("/importDefinition") + @PostMapping("/importDef") @Transactional(rollbackFor = Exception.class) - public R importDefinition(MultipartFile file) { + public R importDef(MultipartFile file) { return R.ok(iFlwDefinitionService.importXml(file)); } @@ -155,9 +155,9 @@ public class FlwDefinitionController extends BaseController { * @throws IOException 异常 */ @Log(title = "流程定义", businessType = BusinessType.EXPORT) - @PostMapping("/exportDefinition/{id}") - public void exportDefinition(@PathVariable Long id, HttpServletResponse response) throws IOException { - iFlwDefinitionService.exportDefinition(id, response); + @PostMapping("/exportDef/{id}") + public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException { + iFlwDefinitionService.exportDef(id, response); } /** @@ -176,8 +176,8 @@ public class FlwDefinitionController extends BaseController { * @param id 流程定义id * @param active 激活/挂起 */ - @PutMapping("/updateDefinitionState/{id}/{active}") - public R active(@PathVariable Long id, @PathVariable boolean active) { + @PutMapping("/active/{id}") + public R active(@PathVariable Long id, @RequestParam boolean active) { return R.ok(active ? defService.unActive(id) : defService.active(id)); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index c2349ff99..91bb4e0cc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -29,7 +29,7 @@ import java.util.Map; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/workflow/processInstance") +@RequestMapping("/workflow/instance") public class FlwInstanceController extends BaseController { private final IFlwInstanceService flwInstanceService; @@ -41,9 +41,9 @@ public class FlwInstanceController extends BaseController { * @param instance 参数 * @param pageQuery 分页 */ - @GetMapping("/getPageByRunning") - public TableDataInfo getPageByRunning(Instance instance, PageQuery pageQuery) { - return flwInstanceService.getPageByRunning(instance, pageQuery); + @GetMapping("/pageByRunning") + public TableDataInfo pageByRunning(Instance instance, PageQuery pageQuery) { + return flwInstanceService.pageByRunning(instance, pageQuery); } /** @@ -52,9 +52,9 @@ public class FlwInstanceController extends BaseController { * @param instance 参数 * @param pageQuery 分页 */ - @GetMapping("/getPageByFinish") - public TableDataInfo getPageByFinish(Instance instance, PageQuery pageQuery) { - return flwInstanceService.getPageByFinish(instance, pageQuery); + @GetMapping("/pageByFinish") + public TableDataInfo pageByFinish(Instance instance, PageQuery pageQuery) { + return flwInstanceService.pageByFinish(instance, pageQuery); } /** @@ -93,8 +93,8 @@ public class FlwInstanceController extends BaseController { * @param id 流程定义id * @param active 激活/挂起 */ - @PutMapping("/active/{id}/{active}") - public R active(@PathVariable Long id, @PathVariable boolean active) { + @PutMapping("/active/{id}") + public R active(@PathVariable Long id, @RequestParam boolean active) { if (active) { return R.ok(insService.unActive(id)); } else { @@ -109,9 +109,9 @@ public class FlwInstanceController extends BaseController { * @param flowInstanceBo 参数 * @param pageQuery 分页 */ - @GetMapping("/getPageByCurrent") - public TableDataInfo getPageByCurrent(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.getPageByCurrent(flowInstanceBo, pageQuery); + @GetMapping("/pageByCurrent") + public TableDataInfo pageByCurrent(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return flwInstanceService.pageByCurrent(flowInstanceBo, pageQuery); } @@ -120,9 +120,9 @@ public class FlwInstanceController extends BaseController { * * @param businessId 业务id */ - @GetMapping("/getFlowImage/{businessId}") - public R> getFlowImage(@PathVariable String businessId) { - return R.ok(flwInstanceService.getFlowImage(businessId)); + @GetMapping("/flowImage/{businessId}") + public R> flowImage(@PathVariable String businessId) { + return R.ok(flwInstanceService.flowImage(businessId)); } /** @@ -130,9 +130,9 @@ public class FlwInstanceController extends BaseController { * * @param instanceId 流程实例id */ - @GetMapping("/getInstanceVariable/{instanceId}") - public R> getInstanceVariable(@PathVariable String instanceId) { - return R.ok(flwInstanceService.getInstanceVariable(instanceId)); + @GetMapping("/instanceVariable/{instanceId}") + public R> instanceVariable(@PathVariable String instanceId) { + return R.ok(flwInstanceService.instanceVariable(instanceId)); } /** @@ -142,8 +142,8 @@ public class FlwInstanceController extends BaseController { */ @Log(title = "流程实例管理", businessType = BusinessType.INSERT) @RepeatSubmit() - @PostMapping("/processInvalid") - public R processInvalid(@Validated @RequestBody FlowInvalidBo bo) { + @PostMapping("/invalid") + public R invalid(@Validated @RequestBody FlowInvalidBo bo) { return R.ok(flwInstanceService.processInvalid(bo)); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 1f2029a53..70c1a5820 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -69,9 +69,9 @@ public class FlwTaskController extends BaseController { * @param flowTaskBo 参数 * @param pageQuery 分页 */ - @GetMapping("/getPageByTaskWait") - public TableDataInfo getPageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.getPageByTaskWait(flowTaskBo, pageQuery); + @GetMapping("/pageByTaskWait") + public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery); } /** @@ -81,9 +81,9 @@ public class FlwTaskController extends BaseController { * @param pageQuery 分页 */ - @GetMapping("/getPageByTaskFinish") - public TableDataInfo getPageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.getPageByTaskFinish(flowTaskBo, pageQuery); + @GetMapping("/pageByTaskFinish") + public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery); } /** @@ -92,9 +92,9 @@ public class FlwTaskController extends BaseController { * @param flowTaskBo 参数 * @param pageQuery 分页 */ - @GetMapping("/getPageByAllTaskWait") - public TableDataInfo getPageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.getPageByAllTaskWait(flowTaskBo, pageQuery); + @GetMapping("/pageByAllTaskWait") + public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery); } /** @@ -104,9 +104,9 @@ public class FlwTaskController extends BaseController { * @param pageQuery 分页 */ - @GetMapping("/getPageByAllTaskFinish") - public TableDataInfo getPageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.getPageByAllTaskFinish(flowTaskBo, pageQuery); + @GetMapping("/pageByAllTaskFinish") + public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery); } /** @@ -115,9 +115,9 @@ public class FlwTaskController extends BaseController { * @param flowTaskBo 参数 * @param pageQuery 分页 */ - @GetMapping("/getPageByTaskCopy") - public TableDataInfo getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.getPageByTaskCopy(flowTaskBo, pageQuery); + @GetMapping("/pageByTaskCopy") + public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery); } /** @@ -125,8 +125,8 @@ public class FlwTaskController extends BaseController { * * @param taskId 任务id */ - @GetMapping("/getTaskById/{taskId}") - public R getTaskById(@PathVariable Long taskId) { + @GetMapping("/getTask/{taskId}") + public R getTask(@PathVariable Long taskId) { return R.ok(flwTaskService.selectById(taskId)); } @@ -195,9 +195,9 @@ public class FlwTaskController extends BaseController { * * @param taskId 任务id */ - @GetMapping("/getUserListTaskId/{taskId}") - public R> getUserListTaskId(@PathVariable Long taskId) { - return R.ok(flwTaskService.getUserListTaskId(taskId)); + @GetMapping("/currentTaskAllUser/{taskId}") + public R> currentTaskAllUser(@PathVariable Long taskId) { + return R.ok(flwTaskService.currentTaskAllUser(taskId)); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java index 176aba2e4..928935a95 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java @@ -1,20 +1,21 @@ package org.dromara.workflow.controller; -import java.util.List; - +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; -import jakarta.validation.constraints.*; -import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; +import org.dromara.workflow.domain.bo.WfDefinitionConfigBo; import org.dromara.workflow.domain.vo.WfDefinitionConfigVo; import org.dromara.workflow.service.IWfDefinitionConfigService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 流程定义配置 @@ -25,7 +26,7 @@ import org.dromara.workflow.service.IWfDefinitionConfigService; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/workflow/definitionConfig") +@RequestMapping("/workflow/defConfig") public class WfDefinitionConfigController extends BaseController { private final IWfDefinitionConfigService wfDefinitionConfigService; @@ -70,9 +71,9 @@ public class WfDefinitionConfigController extends BaseController { * @param tableName 表名 * @param definitionId 流程定义id */ - @GetMapping("/getByTableNameNotDefId/{tableName}/{definitionId}") - public R> getByTableNameNotDefId(@NotBlank(message = "表名不能为空") @PathVariable String tableName, - @NotBlank(message = "流程定义ID不能为空") @PathVariable String definitionId) { + @GetMapping("/getByTableNameNotDefId") + public R> getByTableNameNotDefId(@NotBlank(message = "表名不能为空") @RequestParam String tableName, + @NotBlank(message = "流程定义ID不能为空") @RequestParam String definitionId) { return R.ok(wfDefinitionConfigService.getByTableNameNotDefId(tableName, definitionId)); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index fb4c1d27e..7386db256 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -40,7 +40,7 @@ public interface IFlwDefinitionService { * @param response 响应 * @throws IOException 异常 */ - void exportDefinition(Long id, HttpServletResponse response) throws IOException; + void exportDef(Long id, HttpServletResponse response) throws IOException; /** * 导入流程定义 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index 338bd3056..f3834bf02 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -26,7 +26,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByRunning(Instance instance, PageQuery pageQuery); + TableDataInfo pageByRunning(Instance instance, PageQuery pageQuery); /** * 分页查询已结束的流程实例 @@ -35,7 +35,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByFinish(Instance instance, PageQuery pageQuery); + TableDataInfo pageByFinish(Instance instance, PageQuery pageQuery); /** * 按照业务id查询流程实例 @@ -92,7 +92,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery); + TableDataInfo pageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery); /** * 获取流程图,流程记录 @@ -100,7 +100,7 @@ public interface IFlwInstanceService { * @param businessId 业务id * @return 结果 */ - Map getFlowImage(String businessId); + Map flowImage(String businessId); /** * 按照实例id更新状态 @@ -116,7 +116,7 @@ public interface IFlwInstanceService { * @param instanceId 实例id * @return 结果 */ - Map getInstanceVariable(String instanceId); + Map instanceVariable(String instanceId); /** * 设置流程变量 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index 6d738d39d..ba0436a44 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -43,7 +43,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); + TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询当前租户所有待办任务 @@ -52,7 +52,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); + TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** @@ -62,7 +62,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); + TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询已办任务 @@ -71,7 +71,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); + TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询当前用户的抄送 @@ -80,7 +80,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery); + TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 修改任务办理人 @@ -178,5 +178,5 @@ public interface IFlwTaskService { * @param taskId 任务id * @return 结果 */ - List getUserListTaskId(Long taskId); + List currentTaskAllUser(Long taskId); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index d40059aae..f6e78afe1 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -101,7 +101,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { * @throws IOException 异常 */ @Override - public void exportDefinition(Long id, HttpServletResponse response) throws IOException { + public void exportDef(Long id, HttpServletResponse response) throws IOException { Document document = defService.exportXml(id); // 设置生成xml的格式 OutputFormat of = OutputFormat.createPrettyPrint(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 0549c36cc..ac7a87f15 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -80,7 +80,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByRunning(Instance instance, PageQuery pageQuery) { + public TableDataInfo pageByRunning(Instance instance, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("t.flow_status", BusinessStatusEnum.runningStatus()); Page page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); @@ -97,7 +97,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByFinish(Instance instance, PageQuery pageQuery) { + public TableDataInfo pageByFinish(Instance instance, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("t.flow_status", BusinessStatusEnum.finishStatus()); Page page = flwInstanceMapper.page(pageQuery.build(), queryWrapper); @@ -209,7 +209,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery) { + public TableDataInfo pageByCurrent(FlowInstanceBo instanceBo, PageQuery pageQuery) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (StringUtils.isNotBlank(instanceBo.getFlowCode())) { List flowDefinitions = flowDefinitionMapper.selectList( @@ -248,7 +248,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @param businessId 业务id */ @Override - public Map getFlowImage(String businessId) { + public Map flowImage(String businessId) { Map map = new HashMap<>(16); FlowInstance flowInstance = selectInstByBusinessId(businessId); if (flowInstance == null) { @@ -290,7 +290,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @param instanceId 实例id */ @Override - public Map getInstanceVariable(String instanceId) { + public Map instanceVariable(String instanceId) { Map map = new HashMap<>(); FlowInstance flowInstance = flowInstanceMapper.selectById(instanceId); Map variableMap = flowInstance.getVariableMap(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 497973031..9e3d907e8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -255,7 +255,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.in("t.processed_by", SpringUtils.getBean(WorkflowPermissionHandler.class).permissions()); @@ -271,7 +271,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); queryWrapper.in("t.approver", LoginHelper.getUserIdStr()); @@ -287,7 +287,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); Page page = flwTaskMapper.getTaskWaitByPage(pageQuery.build(), queryWrapper); @@ -301,7 +301,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); Page page = flwTaskMapper.getTaskFinishByPage(pageQuery.build(), queryWrapper); return TableDataInfo.build(page); @@ -314,7 +314,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { * @param pageQuery 分页 */ @Override - public TableDataInfo getPageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr()); Page page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper); @@ -646,7 +646,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService { * @param taskId 任务id */ @Override - public List getUserListTaskId(Long taskId) { + public List currentTaskAllUser(Long taskId) { // 获取与当前任务关联的用户列表 List associatedUsers = userService.getByAssociateds(Collections.singletonList(taskId)); if (CollUtil.isEmpty(associatedUsers)) {