加入查询下一节点数

java110-interface/src/main/java/com/java110/intf/common/IOaWorkflowUserInnerServiceSMO.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
 
+
 @FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
 @RequestMapping("/oaWorkflowUserApi")
 public interface IOaWorkflowUserInnerServiceSMO {
@@ -104,4 +105,6 @@ public interface IOaWorkflowUserInnerServiceSMO {
     @RequestMapping(value = "/getTaskCurrentUser", method = RequestMethod.POST)
     JSONObject getTaskCurrentUser(@RequestBody JSONObject reqJson);
 
+    @RequestMapping(value = "/nextAllNodeTaskList", method = RequestMethod.POST)
+    List<JSONObject> nextAllNodeTaskList(@RequestBody JSONObject reqJson);
 }

service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java

@@ -12,15 +12,12 @@ import com.java110.intf.common.IOaWorkflowUserInnerServiceSMO;
 import com.java110.intf.common.IWorkflowInnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.FlowNode;
 import org.activiti.bpmn.model.SequenceFlow;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricActivityInstance;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
@@ -408,6 +405,24 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
 
     }
 
+    @Override
+    public List<JSONObject> nextAllNodeTaskList(@RequestBody JSONObject reqJson) {
+        List<Task> taskList = null;
+        TaskService taskService = processEngine.getTaskService();
+        Task task = taskService.createTaskQuery().taskId(reqJson.getString("taskId")).singleResult();
+        if (task == null) {
+            throw new IllegalArgumentException("任务已处理");
+        }
+        taskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
+        String taskStr = JSONObject.toJSONString(taskList);
+        logger.debug("查询任务" + taskStr);
+        List<JSONObject> tasks = new ArrayList<>();
+        for (Task task1 : taskList) {
+            tasks.add(BeanConvertUtil.beanCovertJson(task1));
+        }
+        return tasks;
+    }
+
 
     public ProcessEngine getProcessEngine() {
         return processEngine;

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -451,4 +451,22 @@ public class OaWorkflowApi {
         reqJson.put("curUserId", userId);
         return getOaWorkflowFormBMOImpl.auditOaWorkflow(reqJson);
     }
+
+    /**
+     * 审核流程
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /oaWorkflow/getNextTask
+     * @path /app/oaWorkflow/getNextTask
+     */
+    @RequestMapping(value = "/getNextTask", method = RequestMethod.POST)
+    public ResponseEntity<String> getNextTask(@RequestHeader(value = "store-id") String storeId,
+                                                  @RequestHeader(value = "user-id") String userId,
+                                                  @RequestParam(value = "taskId") String taskId) {
+        JSONObject reqJson = new JSONObject();
+        reqJson.put("storeId", storeId);
+        reqJson.put("taskId", taskId);
+        return getOaWorkflowFormBMOImpl.getNextTask(reqJson);
+    }
 }

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/IGetOaWorkflowFormBMO.java

@@ -52,4 +52,11 @@ public interface IGetOaWorkflowFormBMO {
      * @return
      */
     ResponseEntity<String> auditOaWorkflow(JSONObject reqJson);
+
+    /**
+     * 查询 下一任务数
+     * @param reqJson
+     * @return
+     */
+    ResponseEntity<String> getNextTask(JSONObject reqJson);
 }

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java

@@ -307,6 +307,12 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         return ResultVo.success();
     }
 
+    @Override
+    public ResponseEntity<String> getNextTask(JSONObject reqJson) {
+        List<JSONObject> tasks = oaWorkflowUserInnerServiceSMOImpl.nextAllNodeTaskList(reqJson);
+        return ResultVo.createResponseEntity(tasks);
+    }
+
     /**
      * 刷入表单数据
      *