From e986da1b8f24b13a01b24cb78acd2c492c491416 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 20 May 2025 18:34:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=AD=A5=E9=AA=A4=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1423146475814912]手动调用接口更新工单步骤状态接口返回信息提示bug http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1423146475814912 --- .../UpdateProcessTaskStepStatusApi.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/manualintervention/UpdateProcessTaskStepStatusApi.java b/src/main/java/neatlogic/module/process/api/processtask/manualintervention/UpdateProcessTaskStepStatusApi.java index c6db3bd34..10d584ab5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/manualintervention/UpdateProcessTaskStepStatusApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/manualintervention/UpdateProcessTaskStepStatusApi.java @@ -252,16 +252,21 @@ public class UpdateProcessTaskStepStatusApi extends PrivateApiComponentBase {// /** * 更改步骤状态为待处理 * - * @param processTaskStepVo + * @param processTaskStep */ - private void changeProcessTaskStepStatusToPending(ProcessTaskStepVo processTaskStepVo) { - if ("process".equals(processTaskStepVo.getType())) { - processTaskMapper.deleteProcessTaskStepUser(new ProcessTaskStepUserVo(processTaskStepVo.getId(), ProcessUserType.MAJOR.getValue())); - processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(processTaskStepVo.getId(), ProcessUserType.MAJOR.getValue())); - processTaskMapper.insertIgnoreProcessTaskStepWorker(new ProcessTaskStepWorkerVo(processTaskStepVo.getProcessTaskId(), processTaskStepVo.getId() - , GroupSearch.USER.getValue(), processTaskStepVo.getOriginalUserVo().getUuid(), ProcessUserType.MAJOR.getValue())); + private void changeProcessTaskStepStatusToPending(ProcessTaskStepVo processTaskStep) { + if ("process".equals(processTaskStep.getType())) { + processTaskMapper.deleteProcessTaskStepUser(new ProcessTaskStepUserVo(processTaskStep.getId(), ProcessUserType.MAJOR.getValue())); + processTaskMapper.deleteProcessTaskStepWorker(new ProcessTaskStepWorkerVo(processTaskStep.getId(), ProcessUserType.MAJOR.getValue())); + processTaskMapper.insertIgnoreProcessTaskStepWorker(new ProcessTaskStepWorkerVo(processTaskStep.getProcessTaskId(), processTaskStep.getId() + , GroupSearch.USER.getValue(), processTaskStep.getOriginalUserVo().getUuid(), ProcessUserType.MAJOR.getValue())); + } + ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(processTaskStep.getId(), ProcessTaskStepStatus.PENDING, 1); + if (processTaskStep.getActiveTime() == null) { + processTaskStepVo.setUpdateActiveTime(1); } - processTaskMapper.updateProcessTaskStepStatusByStepId(new ProcessTaskStepVo(processTaskStepVo.getId(), ProcessTaskStepStatus.PENDING, 1)); + processTaskMapper.updateProcessTaskStepStatus(processTaskStepVo); +// processTaskMapper.updateProcessTaskStepStatusByStepId(new ProcessTaskStepVo(processTaskStepVo.getId(), ProcessTaskStepStatus.PENDING, 1)); processTaskMapper.updateProcessTaskStatus(new ProcessTaskVo(processTaskStepVo.getProcessTaskId(), ProcessTaskStatus.RUNNING)); } @@ -271,7 +276,13 @@ public class UpdateProcessTaskStepStatusApi extends PrivateApiComponentBase {// * @param processTaskStep 步骤 */ private void changeProcessTaskStepStatusToRunning(ProcessTaskStepVo processTaskStep) { - processTaskMapper.updateProcessTaskStepStatusByStepId(new ProcessTaskStepVo(processTaskStep.getId(), ProcessTaskStepStatus.RUNNING, 1)); + ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(processTaskStep.getId(), ProcessTaskStepStatus.RUNNING, 1); + if (processTaskStep.getActiveTime() == null) { + processTaskStepVo.setUpdateActiveTime(1); + } + processTaskStepVo.setUpdateStartTime(1); + processTaskMapper.updateProcessTaskStepStatus(processTaskStepVo); +// processTaskMapper.updateProcessTaskStepStatusByStepId(new ProcessTaskStepVo(processTaskStep.getId(), ProcessTaskStepStatus.RUNNING, 1)); processTaskMapper.updateProcessTaskStatus(new ProcessTaskVo(processTaskStep.getProcessTaskId(), ProcessTaskStatus.RUNNING)); } -- Gitee