From 85633c5922195fac555ea828c062783dac1d68fc Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 20 May 2025 11:10:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=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 | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 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 18f91c6b7..c6db3bd34 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 @@ -30,6 +30,8 @@ import neatlogic.framework.process.auth.PROCESSTASK_MODIFY; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.processtask.*; +import neatlogic.framework.process.stephandler.core.IProcessStepHandler; +import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -147,9 +149,19 @@ public class UpdateProcessTaskStepStatusApi extends PrivateApiComponentBase {// List processTaskStepUserList = processTaskMapper.getProcessTaskStepUserByStepId(processTaskStepVo.getId(), ProcessUserType.MAJOR.getValue()); // 需要处理人的步骤，不指定处理人时，旧处理人必须存在 if (processTaskStepUserList.isEmpty()) { - throw new ProcessTaskStepUserUnAssignException(); +// throw new ProcessTaskStepUserUnAssignException(); + IProcessStepHandler processStepHandler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); + if (processStepHandler != null) { + try { + processStepHandler.assign(processTaskStepVo); + } catch (ProcessTaskException e) { + throw new RuntimeException(e); + } + } + changeProcessTaskStepStatusToRunning(processTaskStepVo); + } else { + changeProcessTaskStepStatusToRunning(processTaskStepVo, new UserVo(processTaskStepUserList.get(0).getUserUuid(), processTaskStepUserList.get(0).getUserName())); } - changeProcessTaskStepStatusToRunning(processTaskStepVo, new UserVo(processTaskStepUserList.get(0).getUserUuid(), processTaskStepUserList.get(0).getUserName())); } else { processTaskMapper.deleteProcessTaskStepUser(new ProcessTaskStepUserVo(processTaskStepVo.getId(), ProcessUserType.MAJOR.getValue())); processTaskMapper.insertProcessTaskStepUser(new ProcessTaskStepUserVo( @@ -216,8 +228,13 @@ public class UpdateProcessTaskStepStatusApi extends PrivateApiComponentBase {// if (ProcessStepHandlerType.END.getHandler().equals(processTaskStepVo.getHandler())) { processTaskMapper.updateProcessTaskStatus(new ProcessTaskVo(processTaskStepVo.getProcessTaskId(), ProcessTaskStatus.SUCCEED)); } else if (nextStep != null) { - processTaskMapper.updateProcessTaskStepRelIsHit(new ProcessTaskStepRelVo(processTaskStepVo.getId(), nextStep.getId(), 1)); - map.get(ProcessTaskStepStatus.SUCCEED.getValue()).accept(nextStep); + if (ProcessStepHandlerType.END.getHandler().equals(nextStep.getHandler())) { + processTaskMapper.updateProcessTaskStepRelIsHit(new ProcessTaskStepRelVo(processTaskStepVo.getId(), nextStep.getId(), 1)); + map.get(ProcessTaskStepStatus.SUCCEED.getValue()).accept(nextStep); + } else { + processTaskMapper.updateProcessTaskStepRelIsHit(new ProcessTaskStepRelVo(processTaskStepVo.getId(), nextStep.getId(), 1)); + map.get(ProcessTaskStepStatus.RUNNING.getValue()).accept(nextStep); + } } }); map.put(ProcessTaskStepStatus.HANG.getValue(), processTaskStepVo -> { -- Gitee