Merge remote-tracking branch 'origin/master'

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

@@ -54,7 +54,7 @@ public class WorkFlowController {
 
     @PostMapping("/findUserTask")
     @ApiOperation("任务个人待办列表")
-    public List<Task> findUserTask(@RequestBody NextTaskVo nextTaskVo){
+    public List<Map<String,Object>> findUserTask(@RequestBody NextTaskVo nextTaskVo){
 
         return workFlowService.findTaskByUserId(nextTaskVo);
 

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

@@ -69,7 +69,7 @@ public interface WorkFlowService {
      * @param nextTaskVo
      * @return 任务列表
      */
-    List<Task> findTaskByUserId(NextTaskVo nextTaskVo);
+    List<Map<String,Object>> findTaskByUserId(NextTaskVo nextTaskVo);
 
     /**
      * 查看具体的任务详情

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

@@ -10,6 +10,7 @@ import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
+import org.flowable.engine.HistoryService;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
@@ -17,6 +18,7 @@ import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.TaskQuery;
+import org.flowable.task.api.history.HistoricTaskInstance;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,7 +49,8 @@ public class WorkFlowServiceImpl implements WorkFlowService {
     @Autowired
     private FlowsInfoMapper flowsInfoMapper;
 
-
+    @Autowired
+    private HistoryService historyService;
     @Autowired
     private NodePageService nodePageService;
 
@@ -227,8 +230,9 @@ public class WorkFlowServiceImpl implements WorkFlowService {
 
 
     @Override
-    public List<Task> findTaskByUserId(NextTaskVo nextTaskVo) {
+    public List<Map<String,Object>> findTaskByUserId(NextTaskVo nextTaskVo) {
 
+        List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();
         TaskQuery taskQuery = taskService.createTaskQuery().or();
         if (nextTaskVo.getUserId()!=null){
             taskQuery.taskCandidateUser(nextTaskVo.getUserId()).orderByTaskCreateTime().desc();
@@ -237,8 +241,18 @@ public class WorkFlowServiceImpl implements WorkFlowService {
             taskQuery.taskCandidateGroupIn(nextTaskVo.getRoleId()).orderByTaskCreateTime().desc();
         }
         List<Task> listTask = taskQuery.endOr().list();
-
-        return listTask;
+        for (Task task : listTask) {
+            Map<String, Object> map = new HashMap<>();
+            ProcessInstance processInstance =
+                    runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+            String startUserId = processInstance.getStartUserId();
+            map.put("taskName",task.getName());
+            map.put("taskDesc",task.getDescription());
+            map.put("createTime",task.getCreateTime());
+            map.put("promoter",startUserId);
+            listmap.add(map);
+        }
+        return listmap;
 
     }