diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java index 69df2251..7b752d93 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java +++ b/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()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java index 7733e88e..16e64950 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java +++ b/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 = "章节编号") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java index cf73ed2b..3a27fb27 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java +++ b/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 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 cac8a9f8..a66c0609 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 @@ -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 subProcessInstanceList = runtimeService.createProcessInstanceQuery() + .superProcessInstanceId(processInstanceId).processDefinitionKey(ConsultationTaskKey.SUB_PROCESS_1).list(); + 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("============任务信息=============="); + 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 departLeaderList = Arrays.asList(departLeaders.split(",")); @@ -97,6 +120,36 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl 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 queryProcessInfoVO(String draftId, String processInstanceId) { + return null; + } + /** * @Author: liao * @Date: 2023/11/13 16:00 @@ -118,53 +171,40 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl processInfoVO) { + private void processEngineer_2(ProcessInfoVO 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 queryProcessInfoVO(String draftId, String processInstanceId) { - return null; - } - /** * @Author: liao * @Date: 2023/11/14 9:35 * @Description: 各部所主管级领导分发 **/ - private void processDepartLeaderStart(ProcessInfoVO processInfoVO) { + private void processDepartLeaderStart_1(ProcessInfoVO 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 removeWrapper = new LambdaQueryWrapper<>(); removeWrapper.eq(ProcessFbConsultationUserLink::getBusinessId, processInfoVO.getBusinessId()); @@ -205,13 +245,15 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl