add 章节id字段

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java

@@ -130,7 +130,7 @@ public class ProcessFbInfoController {
         System.out.println("============= 多人会签 =============");
         taskList.forEach(task -> {
             taskService.claim(task.getId(), task.getAssignee());
-            taskService.complete(task.getId());
+            //taskService.complete(task.getId());
             System.out.println("完成任务: " + task.getId());
         });
         System.out.println("==========================");
@@ -145,7 +145,7 @@ public class ProcessFbInfoController {
         });
         System.out.println("==========================");
         tomTask = taskList.get(0);
-        taskService.complete(tomTask.getId());
+        //taskService.complete(tomTask.getId());
         System.out.println("完成任务: " + tomTask.getId());
         System.out.println("任务名称: " + tomTask.getName());
         System.out.println("完成人: " + tomTask.getAssignee());

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java

@@ -39,6 +39,10 @@ public class ProcessFbConsultationList implements Serializable {
 	@Excel(name = "序号", width = 15)
     @ApiModelProperty(value = "序号")
     private java.lang.String serialNumber;
+    /**章节id*/
+    @Excel(name = "章节id", width = 15)
+    @ApiModelProperty(value = "章节id")
+    private java.lang.String chapterId;
 	/**章节编号*/
 	@Excel(name = "章节编号", width = 15)
     @ApiModelProperty(value = "章节编号")

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java

@@ -18,7 +18,7 @@ public interface IProcessHandleService {
      * @Date: 2023/11/2 17:04
      * @Description: 启动流程
      **/
-    void startProcess(ProcessInfoVO processInfoVO);
+    String startProcess(ProcessInfoVO processInfoVO);
 
     /**
      * @Author: liao

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java

@@ -20,6 +20,7 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
+import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -73,7 +74,29 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_STANDARD_CONSULTATION)); // 流程定义id
         basicProcessInfoDTO.setProcessName(businessInfoDTO.getStandardNumber() + "-" + businessInfoDTO.getStandardName() + "-" + "征求意见"); // 流程名称
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue()); // 流程类型
-        processHandleService.startProcess(processInfoVO);
+        String processInstanceId = processHandleService.startProcess(processInfoVO);
+
+        List<ProcessInstance> subProcessInstanceList = runtimeService.createProcessInstanceQuery()
+                .superProcessInstanceId(processInstanceId).processDefinitionKey(ConsultationTaskKey.SUB_PROCESS_1).list();
+        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("============任务信息==============");
+        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("==========================");
+        });
+        System.out.println("==========================");
 
         // 把各部所主管级领导数据存入关联人员表
         List<String> departLeaderList = Arrays.asList(departLeaders.split(","));
@@ -97,6 +120,36 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
 
     }
 
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:09
+     * @Description: 保存为草稿
+     **/
+    @Override
+    public void saveToDraft(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+
+    }
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:11
+     * @Description: 转办
+     **/
+    @Override
+    public void transfer(String taskId, String toUserId) {
+        processHandleService.transfer(taskId, toUserId);
+    }
+
+    /**
+     * @Author: liao
+     * @Date: 2023/11/16 15:13
+     * @Description: 查询流程信息
+     **/
+    @Override
+    public ProcessInfoVO<ProcessFbStandardConsultationVO> queryProcessInfoVO(String draftId, String processInstanceId) {
+        return null;
+    }
+
     /**
      * @Author: liao
      * @Date: 2023/11/13 16:00
@@ -118,53 +171,40 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         String taskDefinitionKey = task.getTaskDefinitionKey(); // 任务定义id
         processHandleService.isMyTask(taskId); // 判断是否拥有任务处理权
 
-        if (ConsultationTaskKey.DEPART_LEADER_START_1.equals(taskDefinitionKey)) { // 各部所主管级领导分发
+        switch (taskDefinitionKey) {
-            processDepartLeaderStart(processInfoVO);
+            case ConsultationTaskKey.DEPART_LEADER_START_1:
+                processDepartLeaderStart_1(processInfoVO); // 各部所主管级领导分发
+                break;
+            case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（直接）
+                processEngineer_2(processInfoVO);
+                break;
+            default:
+                throw new JeroBootException("目前还未开发，请联系管理员");
         }
     }
 
     /**
      * @Author: liao
-     * @Date: 2023/11/16 15:09
+     * @Date: 2023/11/16 15:46
-     * @Description: 保存为草稿
+     * @Description: 设计工程师填写征求意见（直接）
      **/
-    @Override
+    private void processEngineer_2(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
-    public void saveToDraft(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
 
     }
 
-    /**
-     * @Author: liao
-     * @Date: 2023/11/16 15:11
-     * @Description: 转办
-     **/
-    @Override
-    public void transfer(String taskId, String toUserId) {
-
-    }
-
-    /**
-     * @Author: liao
-     * @Date: 2023/11/16 15:13
-     * @Description: 查询流程信息
-     **/
-    @Override
-    public ProcessInfoVO<ProcessFbStandardConsultationVO> queryProcessInfoVO(String draftId, String processInstanceId) {
-        return null;
-    }
-
     /**
      * @Author: liao
      * @Date: 2023/11/14 9:35
      * @Description: 各部所主管级领导分发
      **/
-    private void processDepartLeaderStart(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+    private void processDepartLeaderStart_1(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
         ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
         ProcessFbConsultationUserLink userLink = businessInfoDTO.getProcessFbConsultationUserLink(); // 业务分派信息
 
         String taskId = processInfoVO.getBasicTaskInfoDTO().getTaskId();
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-        String taskProcessInstanceId = task.getProcessInstanceId();
+        String subProcessInstanceId = task.getProcessInstanceId();
+        String executionId = task.getExecutionId();
 
         LambdaQueryWrapper<ProcessFbConsultationUserLink> removeWrapper = new LambdaQueryWrapper<>();
         removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId());
@@ -205,13 +245,15 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             variables.put("designEngineerList", designEngineerIds);
         }
 
+        runtimeService.setVariablesLocal(subProcessInstanceId, variables);
         // 完成任务
-        taskService.complete(taskId, variables);
+        taskService.complete(taskId);
 
-        System.out.println("================================启动流程=================================");
+        System.out.println("================================各部门主管级领导分发=================================");
         System.out.println("processInstanceId: " + processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId());
-        System.out.println("taskProcessInstanceId: " + taskProcessInstanceId);
+        System.out.println("subProcessInstanceId: " + subProcessInstanceId);
         System.out.println("taskId: " + taskId);
+        System.out.println("executionId: " + executionId);
         System.out.println("=======================================================================");
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -62,7 +62,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
      * @Description: 启动流程
      **/
     @Override
-    public void startProcess(ProcessInfoVO processInfoVO) {
+    public String startProcess(ProcessInfoVO processInfoVO) {
         // 删除自己的草稿
         deleteMyDraft(processInfoVO.getBusinessId());
 
@@ -101,6 +101,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         System.out.println("流程定义id: " + processDefinitionId);
         System.out.println("流程实例id: " + processInstanceId);
         System.out.println("=======================================================================");
+
+        return processInstanceId;
     }
 
     /**