diff --git a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 252cc0e..b8b795a 100644 --- a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -209,4 +209,20 @@ public class FlwTaskController extends BaseController { return R.ok(flwTaskService.currentTaskAllUser(taskId)); } + /** + * 查询当前用户的待办任务数量 + */ + @GetMapping("/countTaskWaitByCurrentUser") + public R countTaskWaitByCurrentUser() { + return R.ok(flwTaskService.countTaskWaitByCurrentUser()); + } + + /** + * 查询当前用户的抄送任务数量 + */ + @GetMapping("/countTaskCopyByCurrentUser") + public R countTaskCopyByCurrentUser() { + return R.ok(flwTaskService.countTaskCopyByCurrentUser()); + } + } diff --git a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java index fd86c82..e100e0a 100644 --- a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java +++ b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java @@ -54,4 +54,20 @@ public interface FlwTaskMapper { * @return 结果 */ Page getTaskCopyByPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + /** + * 查询当前用户的待办任务数量 + * + * @param queryWrapper 条件 + * @return 数量 + */ + Long countTaskWait(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 查询当前用户的抄送任务数量 + * + * @param queryWrapper 条件 + * @return 数量 + */ + Long countTaskCopy(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index 6c7fc6b..27b18fc 100644 --- a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -207,4 +207,18 @@ public interface IFlwTaskService { */ FlowNode getByNodeCode(String nodeCode, Long definitionId); + /** + * 查询当前用户的待办任务数量 + * + * @return 待办任务数量 + */ + Long countTaskWaitByCurrentUser(); + + /** + * 查询当前用户的抄送任务数量 + * + * @return 抄送任务数量 + */ + Long countTaskCopyByCurrentUser(); + } diff --git a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 7f1c170..d499095 100644 --- a/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/hwmom-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -814,4 +814,32 @@ public class FlwTaskServiceImpl implements IFlwTaskService { .eq(FlowNode::getDefinitionId, definitionId)); } + /** + * 查询当前用户的待办任务数量 + * + * @return 待办任务数量 + */ + @Override + public Long countTaskWaitByCurrentUser() { + FlowTaskBo flowTaskBo = new FlowTaskBo(); + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); + queryWrapper.in("t.processed_by", SpringUtils.getBean(WorkflowPermissionHandler.class).permissions()); + queryWrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus()); + return flwTaskMapper.countTaskWait(queryWrapper); + } + + /** + * 查询当前用户的抄送任务数量 + * + * @return 抄送任务数量 + */ + @Override + public Long countTaskCopyByCurrentUser() { + FlowTaskBo flowTaskBo = new FlowTaskBo(); + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr()); + return flwTaskMapper.countTaskCopy(queryWrapper); + } + } diff --git a/ruoyi-modules/hwmom-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/ruoyi-modules/hwmom-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml index f539030..ccd9a8a 100644 --- a/ruoyi-modules/hwmom-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml +++ b/ruoyi-modules/hwmom-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml @@ -112,4 +112,63 @@ ) t ${ew.getCustomSqlSegment} + + + + + +