diff --git a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java index c3f5c4dd825c77d4468f61edc1881371bf2bf80d..4e158dc8502d91a67881b3372984f31e0bf31e09 100644 --- a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java +++ b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java @@ -72,7 +72,7 @@ public class ProcessTaskCallbackHandler extends AutoexecJobCallbackBase { if (autoexecJobVo != null) { AutoexecJobVo autoexecJob = autoexecJobMapper.getJobInfo(autoexecJobVo.getId()); if (AutoExecJobProcessSource.ITSM.getValue().equals(autoexecJob.getSource())) { - if (!JobStatus.PENDING.getValue().equals(autoexecJobVo.getStatus()) && !JobStatus.RUNNING.getValue().equals(autoexecJobVo.getStatus())) { + if (JobStatus.isCompletedStatus(autoexecJobVo.getStatus()) || JobStatus.isFailedStatus(autoexecJobVo.getStatus())) { return true; } } @@ -96,12 +96,12 @@ public class ProcessTaskCallbackHandler extends AutoexecJobCallbackBase { if (CollectionUtils.isNotEmpty(jobIdList)) { List autoexecJobList = autoexecJobMapper.getJobListByIdList(jobIdList); for (AutoexecJobVo jobVo : autoexecJobList) { - if (JobStatus.isRunningStatus(jobVo.getStatus())) { - return; - } else if (JobStatus.isCompletedStatus(jobVo.getStatus())) { + if (JobStatus.isCompletedStatus(jobVo.getStatus())) { completed++; } else if (JobStatus.isFailedStatus(jobVo.getStatus())) { failed++; + } else { + return; } } } @@ -129,14 +129,6 @@ public class ProcessTaskCallbackHandler extends AutoexecJobCallbackBase { } else { processTaskStepComplete(processTaskStepVo); } -// if (JobStatus.COMPLETED.getValue().equals(autoexecJobVo.getStatus())) { -// processTaskStepComplete(processTaskStepVo, formAttributeDataList, hidecomponentList); -// } else { -// //暂停中、已暂停、中止中、已中止、已失败都属于异常,根据失败策略处理 -// if (FailPolicy.KEEP_ON.getValue().equals(failPolicy)) { -// processTaskStepComplete(processTaskStepVo, formAttributeDataList, hidecomponentList); -// } -// } } }