diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index a66c0609..a4e3bc79 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -76,27 +76,21 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl subProcessInstanceList = runtimeService.createProcessInstanceQuery() - .superProcessInstanceId(processInstanceId).processDefinitionKey(ConsultationTaskKey.SUB_PROCESS_1).list(); + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); List taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); - System.out.println("============== 流程实例信息 ============"); - System.out.println("主流程实例id: " + processInstanceId); - System.out.println("=============子流程信息============="); - subProcessInstanceList.forEach(subProcessInstance -> { - System.out.println("子流程实例Id: " + subProcessInstance.getId()); - System.out.println("SuperExecutionId: " + subProcessInstance.getSuperExecutionId()); - System.out.println("=========================="); - }); + + System.out.println("=============流程信息============="); + System.out.println("processInstanceId" + processInstance.getId()); + System.out.println("SuperExecutionId" + processInstance.getSuperExecutionId()); System.out.println("============任务信息=============="); taskList.forEach(task -> { System.out.println("任务Id: " + task.getId()); System.out.println("ExecutionId: " + task.getExecutionId()); System.out.println("ProcessInstanceId: " + task.getProcessInstanceId()); - System.out.println("ParentTaskId: " + task.getParentTaskId()); + System.out.println("Assignee: " + task.getAssignee()); System.out.println("=========================="); }); - System.out.println("=========================="); // 把各部所主管级领导数据存入关联人员表 List departLeaderList = Arrays.asList(departLeaders.split(",")); @@ -147,7 +141,15 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId) { - return null; + ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId); + ProcessFbStandardConsultationVO processFbStandardConsultationVO = new ProcessFbStandardConsultationVO(); + + ProcessFbStandardConsultation processFbStandardConsultation = getById(processInfoVO.getBusinessId()); + processFbStandardConsultationVO.setProcessFbStandardConsultation(processFbStandardConsultation); // 业务基本信息 + + + processInfoVO.setBusinessInfoDTO(processFbStandardConsultationVO); + return processInfoVO; } /**