修改查询待办

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FlowsInfoController.java

@@ -113,7 +113,7 @@ public class FlowsInfoController {
     }
 
     @PostMapping("/createFlow")
-    public Long createFlow(@RequestBody FlowsInfoVo flowsInfo){
-        return workFlowService.createFlow(flowsInfo.toEntity());
+    public Long createFlow(@RequestBody FlowsInfoVo flowsInfovo){
+        return workFlowService.createFlow(flowsInfovo.toEntity());
     }
 }

src/main/java/com/tykj/workflowcore/workflow_editer/service/WorkFlowService.java

 package com.tykj.workflowcore.workflow_editer.service;
 
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
-import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
-import com.tykj.workflowcore.workflow_editer.vo.StartFlowVo;
-import com.tykj.workflowcore.workflow_editer.vo.SuspendVo;
-import com.tykj.workflowcore.workflow_editer.vo.TaskVo;
+import com.tykj.workflowcore.workflow_editer.vo.*;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
@@ -68,10 +65,10 @@ public interface WorkFlowService {
 
     /**
      * 根据用户id进行任务待办查询
-     * @param userId 用户id
+     * @param nextTaskVo
      * @return 任务列表
      */
-    List<Map<String,Object>> findTaskByUserId(Long userId);
+    List<Map<String,Object>> findTaskByUserId(NextTaskVo nextTaskVo);
 
     /**
      * 查看具体的任务详情
@@ -107,9 +104,6 @@ public interface WorkFlowService {
     //历史查询
 
 
-    //建立用户和组的关系
-
-
     /**
      * 任务的转交
      * @param taskId 任务id

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/WorkFlowServiceImpl.java

 package com.tykj.workflowcore.workflow_editer.service.impl;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
 import com.tykj.workflowcore.workflow_editer.entity.NodePage;
 import com.tykj.workflowcore.workflow_editer.entity.Role;
@@ -9,10 +10,7 @@ import com.tykj.workflowcore.workflow_editer.mapper.RoleMapper;
 import com.tykj.workflowcore.workflow_editer.mapper.UserMapper;
 import com.tykj.workflowcore.workflow_editer.service.NodePageService;
 import com.tykj.workflowcore.workflow_editer.service.WorkFlowService;
-import com.tykj.workflowcore.workflow_editer.vo.FlowsInfoVo;
-import com.tykj.workflowcore.workflow_editer.vo.StartFlowVo;
-import com.tykj.workflowcore.workflow_editer.vo.SuspendVo;
-import com.tykj.workflowcore.workflow_editer.vo.TaskVo;
+import com.tykj.workflowcore.workflow_editer.vo.*;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -238,28 +236,43 @@ public class WorkFlowServiceImpl implements WorkFlowService {
 
 
     @Override
-    public List<Map<String, Object>> findTaskByUserId(Long userId) {
-        // 查询个人待办,指定个人任务       流程变量就是${userId == 具体的数字}
-        List<Task> taskList = taskService.createTaskQuery().taskAssignee(Long.toString(userId)).orderByTaskCreateTime().desc().list();
+    public List<Map<String, Object>> findTaskByUserId(NextTaskVo nextTaskVo) {
 
         ArrayList<Map<String, Object>> list = new ArrayList<>();
+        List<Task> taskList = null;
 
-        //通过userId查询出userName
-       if (userMapper.findById(userId).isPresent()){
-
-           User user = userMapper.findById(userId).get();
+        Long userId = nextTaskVo.getUserId();
+        List<Long> roleIds = nextTaskVo.getRoleId();
+        //全为空
+        if (roleIds.size() == 0 && userId == null){
+            taskList = taskService.createTaskQuery().orderByTaskCreateTime().desc().list();
             for (Task task : taskList) {
-
                 Map<String, Object> map = new HashMap<>();
                 map.put("taskId",task.getId());
                 map.put("taskName",task.getName());
-               map.put("taskAssigne",user.getUserName());
+                map.put("taskCandidateUser",userId);
                 map.put("time",task.getCreateTime());
                 map.put("description",task.getDescription());
                 map.put("processInstanceId",task.getProcessInstanceId());
+                list.add(map);
+            }
 
+        }else {
+            for (Long roleId : roleIds) {
+                taskList = taskService.createTaskQuery().or().taskCandidateUser(Long.toString(userId)).taskCandidateGroup(Long.toString(roleId)).endOr().orderByTaskCreateTime().desc().list();
+                for (Task task : taskList) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("taskId",task.getId());
+                    map.put("taskName",task.getName());
+                    map.put("taskCandidateUser",userId);
+                    map.put("time",task.getCreateTime());
+                    map.put("description",task.getDescription());
+                    map.put("processInstanceId",task.getProcessInstanceId());
                     list.add(map);
                 }
+
+            }
+
         }
         return list;
     }
@@ -267,7 +280,9 @@ public class WorkFlowServiceImpl implements WorkFlowService {
     @Override
     public List<Map<String, Object>> findTaskDetail(Long userId, String taskId) {
 
-        List<Map<String, Object>> mapList = findTaskByUserId(userId);
+
+//        List<Map<String, Object>> mapList = findTaskByUserId(userId);
+        List<Map<String, Object>> mapList = new ArrayList<>();
         Map<String, Object> variables = taskService.getVariables(taskId);
         mapList.add(variables);
         return mapList;

src/main/java/com/tykj/workflowcore/workflow_editer/vo/NextTaskVo.java

+package com.tykj.workflowcore.workflow_editer.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * ClassName:    NextTaskVo
+ * Package:    com.tykj.workflowcore.workflow_editer.vo
+ * Description:
+ * Datetime:    2021/3/5   17:47
+ *
+ * @Author: zsp
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class NextTaskVo {
+
+    private Long userId;
+
+    private List<Long> roleId;
+
+
+}