From 6452c0c59f32f074f2118244ceb90e75ea5ca173 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 21 Jun 2024 14:34:59 +0800 Subject: [PATCH] =?UTF-8?q?update=201=E3=80=81=E6=9B=BF=E6=8D=A2oa?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BC=A0=E5=8F=82=E4=B8=AD=E7=9A=84processId?= =?UTF-8?q?=E4=B8=BAtaskId=202=E3=80=81=E8=BD=AC=E5=8A=9E=E6=97=B6oa?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BC=A0=E5=8F=82=E4=B8=AD=E7=9A=84taskId?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hiwork/service/impl/HiworkTodoServiceImpl.java | 11 ++++++----- .../activiti/entity/ProcessApprovalRecord.java | 7 +++++++ .../activiti/listener/MyGlobalEventListener.java | 6 +++++- 3 files changed, 18 insertions(+), 6 deletions(-) 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 6afe84e6..7f07c8c8 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 @@ -173,11 +173,12 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { hiworkTodo.setSysCode(hiworkSysCode); String date = DateUtil.formatDateTime(new Date()); - + String taskId = processApprovalRecord.getTaskId(); + String transferTaskId = processApprovalRecord.getTransferTaskId(); hiworkTodo.setFlowid(processApprovalRecord.getProcessInstanceId()); - hiworkTodo.setProcessId(processApprovalRecord.getProcessInstanceId()); + hiworkTodo.setProcessId(taskId); hiworkTodo.setProcessType(PROCESS_TYPE); - hiworkTodo.setTaskId(processApprovalRecord.getTaskId()); + hiworkTodo.setTaskId(transferTaskId!=null?transferTaskId:taskId); hiworkTodo.setTaskName(processApprovalRecord.getTaskName()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -228,7 +229,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { //.replaceAll("\\?","%3F") .replace("{projectId}",projectId) .replace("{taskName}",processApprovalRecord.getTaskName()) - .replace("{taskId}",processApprovalRecord.getTaskId()) + .replace("{taskId}", taskId) .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId()) .replace("{nodeId}",processApprovalRecord.getNodeId()); // 跳转链接 @@ -240,7 +241,7 @@ public class HiworkTodoServiceImpl implements PushWorkflowIntegrationAPI { //.replaceAll("\\?","%3F") .replace("{projectId}",projectId) .replace("{taskName}",processApprovalRecord.getTaskName()) - .replace("{taskId}",processApprovalRecord.getTaskId()) + .replace("{taskId}", taskId) .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId()) .replace("{nodeId}",processApprovalRecord.getNodeId()); String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType()))); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java index b260c6bd..258c0569 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java @@ -199,4 +199,11 @@ public class ProcessApprovalRecord { */ @ApiModelProperty(value = "超期标识（0：未超期 1：已超期）") private String overDue; + + /** + * 转办任务id + */ + @TableField(value = "transfer_task_id") + @ApiModelProperty(value = "转办任务id") + private String transferTaskId; } \ No newline at end of file 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 3d4547d7..a4628437 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 @@ -200,7 +200,11 @@ public class MyGlobalEventListener implements ActivitiEventListener { // 对接统一平台生成办结 pushWorkflowIntegrationAPI.sendActivityComplete(list); - + //更新转办任务id + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.eq(ProcessApprovalRecord::getTaskId,taskId); + update.set(ProcessApprovalRecord::getTransferTaskId,taskId+"_"+System.currentTimeMillis()); + recordService.update(update); // 生成被转办人的待办 list.clear(); hiworkTodoAdd.setToUserId(assignee);