From 5deedbdd2228fbce5e037b91dc3a5f82e29b523b Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Fri, 17 Nov 2023 10:48:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...cessFbStandardConsultationServiceImpl.java | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

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<Proces
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue()); // 流程类型
         String processInstanceId = processHandleService.startProcess(processInfoVO);
 
-        List<ProcessInstance> subProcessInstanceList = runtimeService.createProcessInstanceQuery()
-                .superProcessInstanceId(processInstanceId).processDefinitionKey(ConsultationTaskKey.SUB_PROCESS_1).list();
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
         List<Task> 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<String> departLeaderList = Arrays.asList(departLeaders.split(","));
@@ -147,7 +141,15 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
      **/
     @Override
     public ProcessInfoVO<ProcessFbStandardConsultationVO> 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;
     }
 
     /**