From 09789d028462ee5c7e7c53594d1b0dee3fff8ebf Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 11 Jul 2024 18:29:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=9A=82=E5=81=9C?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=AD=A5=E9=AA=A4=EF=BC=8C=E4=B8=94=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=8A=B6=E6=80=81=E4=B8=BA=E5=A4=84=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=AD=A5=E9=AA=A4=E6=97=B6=EF=BC=8C=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=BA=94=E8=AF=A5=E6=98=AF=E5=B7=B2=E6=8C=82?=
 =?UTF-8?q?=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1198603245158400]暂停一个步骤，且没有状态为处理中的步骤时，工单状态应该是已挂起 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1198603245158400
---
 .../process/stephandler/core/ProcessStepHandlerBase.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 eab48400..2c486c5b 100644
--- a/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
+++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepHandlerBase.java
@@ -119,7 +119,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
     private int updateProcessTaskStatus(Long processTaskId) {
         IProcessTaskCrossoverMapper processTaskCrossoverMapper = CrossoverServiceFactory.getApi(IProcessTaskCrossoverMapper.class);
         List<ProcessTaskStepVo> processTaskStepList = processTaskCrossoverMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId);
-        int runningCount = 0, succeedCount = 0, failedCount = 0, abortedCount = 0, draftCount = 0, hangCount = 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)) {
@@ -137,9 +137,9 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
                 abortedCount += 1;
             } else if (processTaskStepVo.getStatus().equals(ProcessTaskStepStatus.SUCCEED.getValue())) {
                 if (ProcessStepHandlerType.END.getHandler().equals(processTaskStepVo.getHandler())) {
-                    succeedCount += 1;
+                    endSucceedCount += 1;
                 } else {
-                    runningCount += 1;
+                    succeedCount += 1;
                 }
             }
         }
@@ -149,7 +149,7 @@ public abstract class ProcessStepHandlerBase implements IProcessStepHandler {
         processTaskVo.setId(processTaskId);
         if (draftCount > 0) {
             processTaskVo.setStatus(ProcessTaskStatus.DRAFT.getValue());
-        } else if (succeedCount > 0) {
+        } else if (endSucceedCount > 0) {
             processTaskVo.setStatus(ProcessTaskStatus.SUCCEED.getValue());
             needCalculateTimeCost = true;
         } else if (abortedCount > 0) {
-- 
Gitee