From 5d57605a9cb78b16a0930af5e1f30b78baf1285e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 15 Feb 2025 17:14:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=90=8E=E6=8F=90=E7=A4=BA=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1357283789864960]工单上报后提示工单未提交 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1357283789864960 --- .../stephandler/core/ProcessStepHandlerBase.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 89bb51af..22b99d20 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -121,7 +121,8 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { private int updateProcessTaskStatus(Long processTaskId) { IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); List processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId); - int runningCount = 0, succeedCount = 0, failedCount = 0, abortedCount = 0, draftCount = 0, hangCount = 0, endSucceedCount = 0; + // 分组统计不同步骤状态的数量 + int runningCount = 0, succeedCount = 0, failedCount = 0, abortedCount = 0, draftCount = 0, hangCount = 0, endSucceedCount = 0, startSucceedCount = 0; for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { if (ProcessTaskStepStatus.DRAFT.getValue().equals(processTaskStepVo.getStatus()) && processTaskStepVo.getIsActive().equals(1)) { @@ -145,7 +146,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { } } } - + // 根据步骤状态计算出工单状态 boolean needCalculateTimeCost = false; ProcessTaskVo processTaskVo = new ProcessTaskVo(); processTaskVo.setId(processTaskId); @@ -2332,7 +2333,10 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.SUCCEED.getValue()); currentProcessTaskStepVo.setUpdateEndTime(1); updateProcessTaskStepStatus(currentProcessTaskStepVo); - + ProcessTaskVo processTaskVo = new ProcessTaskVo(); + processTaskVo.setId(currentProcessTaskStepVo.getId()); + processTaskVo.setStatus(ProcessTaskStatus.RUNNING.getValue()); + processTaskCrossoverMapper.updateProcessTaskStatus(processTaskVo); /* 流转到下一步 **/ List processTaskStepThreadList = new ArrayList<>(); Set nextStepIdSet = getNext(currentProcessTaskStepVo); -- Gitee From e22418718964938fd241f282fcd5d11ae90dd608 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 15 Feb 2025 17:15:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=90=8E=E6=8F=90=E7=A4=BA=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1357283789864960]工单上报后提示工单未提交 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1357283789864960 --- .../process/stephandler/core/ProcessStepHandlerBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 22b99d20..854c3271 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -122,7 +122,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class); List processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId); // 分组统计不同步骤状态的数量 - int runningCount = 0, succeedCount = 0, failedCount = 0, abortedCount = 0, draftCount = 0, hangCount = 0, endSucceedCount = 0, startSucceedCount = 0; + int runningCount = 0, succeedCount = 0, failedCount = 0, abortedCount = 0, draftCount = 0, hangCount = 0, endSucceedCount = 0; for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { if (ProcessTaskStepStatus.DRAFT.getValue().equals(processTaskStepVo.getStatus()) && processTaskStepVo.getIsActive().equals(1)) { -- Gitee From dea8c6c74ae4a267b1f89f0b9e0c9a8532d7c220 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 15 Feb 2025 17:22:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=90=8E=E6=8F=90=E7=A4=BA=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1357283789864960]工单上报后提示工单未提交 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1357283789864960 --- .../process/stephandler/core/ProcessStepHandlerBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 854c3271..793e18b7 100644 --- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java @@ -2332,7 +2332,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler { currentProcessTaskStepVo.setIsActive(2); currentProcessTaskStepVo.setStatus(ProcessTaskStepStatus.SUCCEED.getValue()); currentProcessTaskStepVo.setUpdateEndTime(1); - updateProcessTaskStepStatus(currentProcessTaskStepVo); + processTaskCrossoverMapper.updateProcessTaskStepStatus(currentProcessTaskStepVo); ProcessTaskVo processTaskVo = new ProcessTaskVo(); processTaskVo.setId(currentProcessTaskStepVo.getId()); processTaskVo.setStatus(ProcessTaskStatus.RUNNING.getValue()); -- Gitee