From 0d765d6b808f926bcdf2f590b07b21eebfe718fa Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 31 Jul 2024 12:00:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-sla=E6=97=B6=E6=95=88=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=8A=82=E7=82=B9=EF=BC=8C=E5=8F=AA=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=E9=83=A8=E5=88=86=E8=8A=82=E7=82=B9=EF=BC=8Csla?=
 =?UTF-8?q?=E6=97=B6=E6=95=88=E7=AD=96=E7=95=A5=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1212899547119616]工单处理-sla时效关联多个节点，只激活部分节点，sla时效策略未生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1212899547119616
---
 .../process/thread/ProcessTaskSlaThread.java  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java
index ff006d637..e45bed955 100644
--- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java
+++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java
@@ -436,35 +436,30 @@ public class ProcessTaskSlaThread extends NeatLogicThread {
         ProcessTaskSlaVo processTaskSlaVo = new ProcessTaskSlaVo();
         List<Long> allSlaIdList = processTaskSlaMapper.getSlaIdListByProcessTaskId(processTaskId);
         for (Long slaId : allSlaIdList) {
-//            System.out.println("slaId=" + slaId);
             processTaskSlaVo.setId(slaId);
-            boolean invalid = true;
+            boolean isActive = false;
             List<Long> processTaskStepIdList = processTaskSlaMapper.getProcessTaskStepIdListBySlaId(slaId);
             for (Long processTaskStepId : processTaskStepIdList) {
-                invalid = true;
-//                ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId);
                 List<ProcessTaskStepRelVo> processTaskStepRelList = processTaskMapper.getProcessTaskStepRelByToId(processTaskStepId);
                 for (ProcessTaskStepRelVo processTaskStepRelVo : processTaskStepRelList) {
-//                    ProcessTaskStepVo fromProcessTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepRelVo.getFromProcessTaskStepId());
                     if (processTaskStepRelVo.getType().equals(ProcessFlowDirection.FORWARD.getValue())) {
-//                        System.out.println(fromProcessTaskStepVo.getName() + "-->" + processTaskStepVo.getName() + "=" + processTaskStepRelVo.getIsHit());
                         if (!Objects.equals(processTaskStepRelVo.getIsHit(), -1)) {
-                            invalid = false;
+                            isActive = true;
                             break;
                         }
                     }
                 }
-                if (invalid) {
+                if (isActive) {
                     break;
                 }
             }
-            if (invalid) {
+            if (isActive) {
+                resultList.add(slaId);
+                processTaskSlaVo.setIsActive(1);
+            } else {
                 //该时效失效
                 processTaskSlaVo.setIsActive(0);
                 deleteSlaById(slaId);
-            } else {
-                resultList.add(slaId);
-                processTaskSlaVo.setIsActive(1);
             }
             processTaskSlaMapper.updateProcessTaskSlaIsActiveBySlaId(processTaskSlaVo);
         }
-- 
Gitee