From 4652a525723b7a96086f21664026cf306b7daad9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 11 Mar 2024 16:20:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=9B=86=E6=88=90=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BB=A3=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/docking/hiwork/entity/HiworkTodo.java | 2 +- .../hiwork/service/impl/HiworkTodoServiceImpl.java | 11 +++++++++-- .../activiti/listener/MyGlobalEventListener.java | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java index 892c59d3..c184fd81 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/HiworkTodo.java @@ -36,7 +36,7 @@ public class HiworkTodo { private String taskId; @ApiModelProperty(value = "节点名称") private String taskName; - @ApiModelProperty(value = "是否会签") + @ApiModelProperty(value = "是否进入下一节点（0是 1不是）") private Integer multiInstance; @ApiModelProperty(value = "节点编号") private String nodeBusiCode; diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java index bae736fd..2b86624c 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkTodoServiceImpl.java @@ -142,7 +142,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { ProcessNode processNode = processNodeService.getOne(wrapper,false); if(!Objects.isNull(processNode)){ if(processNode.getNodeName().contains("会签")){ - hiworkTodo.setMultiInstance(1); + } hiworkTodo.setNodeBusiCode(processNode.getXmlNodeId()); // 是否显示（0否，1是） @@ -192,7 +192,14 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { hiworkTodo.setUserName(sysUser.getRealname()); } hiworkTodo.setReceiveTime(Instant.now()); - hiworkTodo.setIsTodo(String.valueOf(processApprovalRecord.getFinishFlag())); + //2已完成时进入下一节点 + Integer finishFlag = processApprovalRecord.getFinishFlag(); + if (finishFlag.equals(2)){ + hiworkTodo.setMultiInstance(0); + }else { + hiworkTodo.setMultiInstance(1); + } + hiworkTodo.setIsTodo(String.valueOf(finishFlag)); hiworkTodoList.add(hiworkTodo); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index 5ff47390..4708ba70 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -202,7 +202,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class); String taskId = delegateTask.getId(); String assignee = delegateTask.getAssignee(); - + String processDefinitionId = delegateTask.getProcessDefinitionId(); //更新审批信息为完成 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessApprovalRecord::getTaskId,taskId); @@ -260,7 +260,7 @@ public class MyGlobalEventListener implements ActivitiEventListener { List list = new ArrayList<>(); HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd(); hiworkTodoAdd.setRecordId(approvalRecord.getId()); - hiworkTodoAdd.setProcessDefinitionId(approvalRecord.getProcessInstanceId()); + hiworkTodoAdd.setProcessDefinitionId(processDefinitionId); list.add(hiworkTodoAdd); pushWorkflowIntegrationAPI.sendTodoTask(list); }