全部工作流2

src/main/java/com/common/workflow/service/activiti/ActivitiService.java

@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.common.workflow.service.dto.ActiHistoricTaskDTO;
 import com.common.workflow.service.dto.ActiMyTaskDTO;
 import com.common.workflow.service.dto.ActiPageResultDTO;
+import com.common.workflow.service.dto.ActiUserTaskDTO;
 import com.common.workflow.web.rest.vm.ActiCompleteVM;
 import com.common.workflow.web.rest.vm.MultiActiCompleteVM;
 import com.common.workflow.web.rest.vm.MultiOrgAuditVM;
@@ -239,19 +240,21 @@ public class ActivitiService {
      *
      * <p>描述: 根据工作流Key 和 用户id查询待办任务列表</p>
      */
-    public String findAllProcessTasks() {
+    public List<ActiUserTaskDTO> findAllProcessTasks() {
         List<Task> resultTasks = taskService.createTaskQuery().list();
         String businessKeys = "";
-        int i = 0;
+        List<ActiUserTaskDTO> myTaskDTOS = new ArrayList<>();
         for (Task myTask : resultTasks) {
-            if(resultTasks.size()-1 == i) {
-                businessKeys += taskService.getVariable(myTask.getId(), "businessKey").toString();
-            } else {
-                businessKeys += taskService.getVariable(myTask.getId(), "businessKey").toString()+ ",";
-            }
-            i++;
+            ActiUserTaskDTO myTaskDTO = new ActiUserTaskDTO();
+            myTaskDTO.setProcessDefinitionId(myTask.getProcessDefinitionId());
+            myTaskDTO.setBusinessKey(taskService.getVariable(myTask.getId(), "businessKey").toString());
+            myTaskDTO.setWorkflowId(myTask.getProcessInstanceId());
+            myTaskDTO.setCreateTime(myTask.getCreateTime().getTime());
+            myTaskDTO.setTaskName(myTask.getName());
+            myTaskDTO.setUserId(myTask.getAssignee());
+            myTaskDTOS.add(myTaskDTO);
         }
-        return businessKeys;
+        return myTaskDTOS;
     }
 
     /**

src/main/java/com/common/workflow/service/dto/ActiUserTaskDTO.java

@@ -0,0 +1,61 @@
+package com.common.workflow.service.dto;
+
+/**
+ * Created by gyue on 2019-09-25.
+ */
+public class ActiUserTaskDTO {
+    private String processDefinitionId;
+    private String taskName;
+    private String businessKey;
+    private String workflowId;
+    private long createTime;
+    private String userId;
+
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public String getBusinessKey() {
+        return businessKey;
+    }
+
+    public void setBusinessKey(String businessKey) {
+        this.businessKey = businessKey;
+    }
+
+    public String getWorkflowId() {
+        return workflowId;
+    }
+
+    public void setWorkflowId(String workflowId) {
+        this.workflowId = workflowId;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}

src/main/java/com/common/workflow/web/rest/ActivitiResource.java

@@ -4,6 +4,7 @@ import com.common.workflow.service.activiti.ActivitiService;
 import com.common.workflow.service.dto.ActiHistoricTaskDTO;
 import com.common.workflow.service.dto.ActiMyTaskDTO;
 import com.common.workflow.service.dto.ActiPageResultDTO;
+import com.common.workflow.service.dto.ActiUserTaskDTO;
 import com.common.workflow.web.rest.vm.*;
 import org.activiti.engine.task.Task;
 import org.slf4j.Logger;
@@ -58,8 +59,8 @@ public class ActivitiResource {
     }
 
     @PostMapping("/all-process-tasks")
-    public ResponseEntity<String> getAllProcessTasks() {
-        String businessKeys = activitiService.findAllProcessTasks();
+    public ResponseEntity<List<ActiUserTaskDTO>> getAllProcessTasks() {
+        List<ActiUserTaskDTO> businessKeys = activitiService.findAllProcessTasks();
         return ResponseEntity.ok(businessKeys);
     }