From 20d9b0d2e87db24ec69889c78acae2c9004cc51b Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sat, 3 Sep 2022 00:56:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=A0=B8):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8BID?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=8A=84=E9=80=81=E4=BB=A5=E5=8F=8A=E5=AE=A1=E6=89=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/workflow/domain/bo/WfTaskBo.java | 2 +- .../ruoyi/workflow/service/impl/WfCopyServiceImpl.java | 4 ++-- .../ruoyi/workflow/service/impl/WfTaskServiceImpl.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfTaskBo.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfTaskBo.java index 8ba46637..acd02d3c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfTaskBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/WfTaskBo.java @@ -30,7 +30,7 @@ public class WfTaskBo { private String comment; @ApiModelProperty("流程实例Id") - private String instanceId; + private String procInsId; @ApiModelProperty("节点") private String targetKey; diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java index bca07ab3..a70676a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java @@ -89,7 +89,7 @@ public class WfCopyServiceImpl implements IWfCopyService { return true; } HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() - .processInstanceId(taskBo.getInstanceId()).singleResult(); + .processInstanceId(taskBo.getProcInsId()).singleResult(); String[] ids = taskBo.getCopyUserIds().split(","); List copyList = new ArrayList<>(ids.length); Long originatorId = LoginHelper.getUserId(); @@ -102,7 +102,7 @@ public class WfCopyServiceImpl implements IWfCopyService { copy.setProcessId(historicProcessInstance.getProcessDefinitionId()); copy.setProcessName(historicProcessInstance.getProcessDefinitionName()); copy.setDeploymentId(historicProcessInstance.getDeploymentId()); - copy.setInstanceId(taskBo.getInstanceId()); + copy.setInstanceId(taskBo.getProcInsId()); copy.setTaskId(taskBo.getTaskId()); copy.setUserId(userId); copy.setOriginatorId(originatorId); diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java index 9df38e2b..0b71ad41 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java @@ -81,10 +81,10 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ throw new ServiceException("任务不存在"); } if (DelegationState.PENDING.equals(task.getDelegationState())) { - taskService.addComment(taskBo.getTaskId(), taskBo.getInstanceId(), FlowComment.DELEGATE.getType(), taskBo.getComment()); + taskService.addComment(taskBo.getTaskId(), taskBo.getProcInsId(), FlowComment.DELEGATE.getType(), taskBo.getComment()); taskService.resolveTask(taskBo.getTaskId()); } else { - taskService.addComment(taskBo.getTaskId(), taskBo.getInstanceId(), FlowComment.NORMAL.getType(), taskBo.getComment()); + taskService.addComment(taskBo.getTaskId(), taskBo.getProcInsId(), FlowComment.NORMAL.getType(), taskBo.getComment()); Long userId = LoginHelper.getUserId(); taskService.setAssignee(taskBo.getTaskId(), userId.toString()); if (ObjectUtil.isNotEmpty(taskBo.getVariables())) { @@ -484,13 +484,13 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ */ @Override public void stopProcess(WfTaskBo bo) { - List task = taskService.createTaskQuery().processInstanceId(bo.getInstanceId()).list(); + List task = taskService.createTaskQuery().processInstanceId(bo.getProcInsId()).list(); if (CollectionUtils.isEmpty(task)) { throw new RuntimeException("流程未启动或已执行完成，取消申请失败"); } ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(bo.getInstanceId()).singleResult(); + .processInstanceId(bo.getProcInsId()).singleResult(); BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId()); if (Objects.nonNull(bpmnModel)) { Process process = bpmnModel.getMainProcess(); @@ -520,7 +520,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ */ @Override public void revokeProcess(WfTaskBo bo) { - Task task = taskService.createTaskQuery().processInstanceId(bo.getInstanceId()).singleResult(); + Task task = taskService.createTaskQuery().processInstanceId(bo.getProcInsId()).singleResult(); if (task == null) { throw new RuntimeException("流程未启动或已执行完成，无法撤回"); }