From 82329e504c763dcb281deea965f476cf6c9910b9 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 7 May 2025 17:40:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1416017803182080]工单步骤完成后，步骤开始时间为空 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1416017803182080 --- .../process/crossover/IProcessTaskCrossoverMapper.java | 2 ++ .../process/stephandler/core/ProcessStepHandlerBase.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java index 9270cb1f..04a6d352 100644 --- a/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/process/crossover/IProcessTaskCrossoverMapper.java @@ -217,6 +217,8 @@ public interface IProcessTaskCrossoverMapper extends ICrossoverService { int updateProcessTaskStepStatus(ProcessTaskStepVo processTaskStepVo); + int updateProcessTaskStepIsActive(ProcessTaskStepVo processTaskStepVo); + int updateProcessTaskStatus(ProcessTaskVo processTaskVo); int updateProcessTaskStepRelIsHit(ProcessTaskStepRelVo processTaskStepRelVo); 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 905124f1..8a60f6be 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -480,6 +480,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 当步骤设置了自动开始时，设置当前步骤状态为处理中 **/ currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); currentProcessTaskStepVo.setUpdateStartTime(1); + currentProcessTaskStepVo.setUpdateEndTime(-1); } } else { processTaskCrossoverMapper.insertIgnoreProcessTaskStepWorker(workerVo); @@ -906,6 +907,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 更新步骤状态 **/ currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.SUCCEED.getValue()); currentProcessTaskStepVo.setIsActive(2); + currentProcessTaskStepVo.setUpdateStartTime(1); currentProcessTaskStepVo.setUpdateEndTime(1); currentProcessTaskStepVo.setError(null); updateProcessTaskStepStatus(currentProcessTaskStepVo); @@ -1485,7 +1487,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { /* 修改步骤状态 **/ currentProcessTaskStepVo.setIsActive(-1); - processTaskCrossoverMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); + processTaskCrossoverMapper.updateProcessTaskStepIsActive(currentProcessTaskStepVo); /* 写入时间审计 **/ processStepHandlerCrossoverUtil.timeAudit(currentProcessTaskStepVo, ProcessTaskOperationType.PROCESSTASK_ABORT); @@ -1591,7 +1593,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } /* 修改步骤状态 **/ - processTaskCrossoverMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); + processTaskCrossoverMapper.updateProcessTaskStepIsActive(currentProcessTaskStepVo); } else if (currentProcessTaskStepVo.getIsActive().equals(1) && ProcessTaskStepStatus.HANG.getValue().equals(currentProcessTaskStepVo.getStatus())) { IProcessStepInternalHandler processStepUtilHandler = ProcessStepInternalHandlerFactory.getHandler(this.getHandler()); if (processStepUtilHandler == null) { @@ -1866,6 +1868,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { processTaskCrossoverMapper.insertProcessTaskStepUser(processTaskStepUserVo); processTaskStepWorkerVo.setUserType(ProcessUserType.MAJOR.getValue()); processTaskStepVo.setStatus(ProcessTaskStepStatus.RUNNING.getValue()); + processTaskStepVo.setUpdateStartTime(1); + processTaskStepVo.setUpdateEndTime(-1); } } JSONArray oldWorkerList = new JSONArray(); -- Gitee