add -- 新增 任务签收功能

ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfProcessBo.java

@@ -0,0 +1,19 @@
+package com.ruoyi.workflow.domain.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 流程业务对象
+ *
+ * @author KonBAI
+ * @createTime 2022/6/11 01:15
+ */
+@Data
+@ApiModel("流程业务对象")
+public class WfProcessBo {
+
+    @ApiModelProperty("流程名称")
+    private String processName;
+}

ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java

@@ -2,6 +2,7 @@ package com.ruoyi.workflow.service;
 
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.workflow.domain.bo.WfProcessBo;
 import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
 import com.ruoyi.workflow.domain.vo.WfTaskVo;
 
@@ -46,6 +47,12 @@ public interface IWfProcessService {
      */
     TableDataInfo<WfTaskVo> queryPageTodoProcessList(PageQuery pageQuery);
 
+    /**
+     * 查询待签任务列表
+     * @param pageQuery 分页参数
+     */
+    TableDataInfo<WfTaskVo> queryPageClaimProcessList(WfProcessBo processBo, PageQuery pageQuery);
+
     /**
      * 查询已办任务列表
      * @param pageQuery 分页参数

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java

@@ -16,6 +16,7 @@ import com.ruoyi.flowable.common.constant.TaskConstants;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
 import com.ruoyi.flowable.utils.TaskUtils;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.workflow.domain.bo.WfProcessBo;
 import com.ruoyi.workflow.domain.vo.WfDefinitionVo;
 import com.ruoyi.workflow.domain.vo.WfTaskVo;
 import com.ruoyi.workflow.service.IWfProcessService;
@@ -243,6 +244,55 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public TableDataInfo<WfTaskVo> queryPageClaimProcessList(WfProcessBo processBo, PageQuery pageQuery) {
+        Page<WfTaskVo> page = new Page<>();
+        Long userId = LoginHelper.getUserId();
+        TaskQuery taskQuery = taskService.createTaskQuery()
+            .active()
+            .includeProcessVariables()
+            .taskCandidateUser(userId.toString())
+            .taskCandidateGroupIn(TaskUtils.getCandidateGroup())
+            .orderByTaskCreateTime().desc();
+        if (StringUtils.isNotBlank(processBo.getProcessName())) {
+            taskQuery.processDefinitionNameLike("%" + processBo.getProcessName() + "%");
+        }
+        page.setTotal(taskQuery.count());
+        int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
+        List<Task> taskList = taskQuery.listPage(offset, pageQuery.getPageSize());
+        List<WfTaskVo> flowList = new ArrayList<>();
+        for (Task task : taskList) {
+            WfTaskVo flowTask = new WfTaskVo();
+            // 当前流程信息
+            flowTask.setTaskId(task.getId());
+            flowTask.setTaskDefKey(task.getTaskDefinitionKey());
+            flowTask.setCreateTime(task.getCreateTime());
+            flowTask.setProcDefId(task.getProcessDefinitionId());
+            flowTask.setTaskName(task.getName());
+            // 流程定义信息
+            ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
+                .processDefinitionId(task.getProcessDefinitionId())
+                .singleResult();
+            flowTask.setDeployId(pd.getDeploymentId());
+            flowTask.setProcDefName(pd.getName());
+            flowTask.setProcDefVersion(pd.getVersion());
+            flowTask.setProcInsId(task.getProcessInstanceId());
+
+            // 流程发起人信息
+            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
+                .processInstanceId(task.getProcessInstanceId())
+                .singleResult();
+            SysUser startUser = userService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId()));
+            flowTask.setStartUserId(startUser.getNickName());
+            flowTask.setStartUserName(startUser.getNickName());
+            flowTask.setStartDeptName(startUser.getDept().getDeptName());
+
+            flowList.add(flowTask);
+        }
+        page.setRecords(flowList);
+        return TableDataInfo.build(page);
+    }
+
     @Override
     public TableDataInfo<WfTaskVo> queryPageFinishedProcessList(PageQuery pageQuery) {
         Page<WfTaskVo> page = new Page<>();

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java

@@ -16,6 +16,7 @@ import com.ruoyi.flowable.factory.FlowServiceFactory;
 import com.ruoyi.flowable.flow.CustomProcessDiagramGenerator;
 import com.ruoyi.flowable.flow.FindNextNodeUtil;
 import com.ruoyi.flowable.flow.FlowableUtils;
+import com.ruoyi.flowable.utils.TaskUtils;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.workflow.domain.bo.WfTaskBo;
@@ -375,12 +376,16 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ
     /**
      * 认领/签收任务
      *
-     * @param bo 请求实体参数
+     * @param taskBo 请求实体参数
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void claim(WfTaskBo bo) {
-        taskService.claim(bo.getTaskId(), bo.getUserId());
+    public void claim(WfTaskBo taskBo) {
+        Task task = taskService.createTaskQuery().taskId(taskBo.getTaskId()).singleResult();
+        if (Objects.isNull(task)) {
+            throw new ServiceException("任务不存在");
+        }
+        taskService.claim(taskBo.getTaskId(), TaskUtils.getUserId());
     }
 
     /**