From 04cac8711229179d2be7d25f161c3c57c7824c38 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 6 Jun 2024 11:41:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E8=87=AA=E5=8A=A8=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1173027352444928]步骤发生异常时，不再自动回退 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1173027352444928 --- .../core/ProcessStepHandlerBase.java | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java index e47b0252..e17efc2b 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -149,14 +149,14 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } else if (succeedCount > 0) { processTaskVo.setStatus(ProcessTaskStatus.SUCCEED.getValue()); needCalculateTimeCost = true; - } else if (runningCount > 0) { - processTaskVo.setStatus(ProcessTaskStatus.RUNNING.getValue()); } else if (abortedCount > 0) { processTaskVo.setStatus(ProcessTaskStatus.ABORTED.getValue()); needCalculateTimeCost = true; } else if (failedCount > 0) { processTaskVo.setStatus(ProcessTaskStatus.FAILED.getValue()); needCalculateTimeCost = true; + } else if (runningCount > 0) { + processTaskVo.setStatus(ProcessTaskStatus.RUNNING.getValue()); } else if (hangCount > 0) { processTaskVo.setStatus(ProcessTaskStatus.HANG.getValue()); } else { @@ -298,18 +298,18 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 异常提醒 **/ processStepHandlerCrossoverUtil.saveStepRemind(currentProcessTaskStepVo, currentProcessTaskStepVo.getStartProcessTaskStepId(), e.getMessage(), ProcessTaskStepRemindType.ERROR); } finally { - if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { - /* - * 发生异常不能激活当前步骤，执行当前步骤的回退操作 - */ - IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); - doNext(ProcessTaskOperationType.STEP_BACK, new ProcessStepThread(currentProcessTaskStepVo) { - @Override - public void myExecute() { - handler.back(currentProcessTaskStepVo); - } - }); - } +// if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { +// /* +// * 发生异常不能激活当前步骤，执行当前步骤的回退操作 +// */ +// IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); +// doNext(ProcessTaskOperationType.STEP_BACK, new ProcessStepThread(currentProcessTaskStepVo) { +// @Override +// public void myExecute() { +// handler.back(currentProcessTaskStepVo); +// } +// }); +// } } return 1; } @@ -1017,16 +1017,16 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 执行动作 **/ processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); } finally { - if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { - /* 发生异常不能完成当前步骤，执行当前步骤的回退操作 **/ - IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); - doNext(ProcessTaskOperationType.STEP_BACK, new ProcessStepThread(currentProcessTaskStepVo) { - @Override - public void myExecute() { - handler.back(currentProcessTaskStepVo); - } - }); - } +// if (Objects.equals(currentProcessTaskStepVo.getStatus(), ProcessTaskStepStatus.FAILED.getValue())) { +// /* 发生异常不能完成当前步骤，执行当前步骤的回退操作 **/ +// IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); +// doNext(ProcessTaskOperationType.STEP_BACK, new ProcessStepThread(currentProcessTaskStepVo) { +// @Override +// public void myExecute() { +// handler.back(currentProcessTaskStepVo); +// } +// }); +// } myCompleteAudit(currentProcessTaskStepVo); if (this.getMode().equals(ProcessStepMode.MT)) { @@ -1260,16 +1260,16 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 执行动作 **/ processStepHandlerCrossoverUtil.action(currentProcessTaskStepVo, ProcessTaskStepNotifyTriggerType.FAILED); } finally { - if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { - /* 发生异常不能完成当前步骤，执行当前步骤的回退操作 **/ - IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); - doNext(ProcessTaskOperationType.STEP_BACK, new ProcessStepThread(currentProcessTaskStepVo) { - @Override - public void myExecute() { - handler.back(currentProcessTaskStepVo); - } - }); - } +// if (ProcessTaskStepStatus.FAILED.getValue().equals(currentProcessTaskStepVo.getStatus())) { +// /* 发生异常不能完成当前步骤，执行当前步骤的回退操作 **/ +// IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(this.getHandler()); +// doNext(ProcessTaskOperationType.STEP_BACK, new ProcessStepThread(currentProcessTaskStepVo) { +// @Override +// public void myExecute() { +// handler.back(currentProcessTaskStepVo); +// } +// }); +// } myReapprovalAudit(currentProcessTaskStepVo); if (this.getMode().equals(ProcessStepMode.MT)) { -- Gitee