From 22332b8f870dd9d5c0a87e01c3984f5052cabb9d Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 12 May 2025 11:49:33 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82=E7=82=B9=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E5=8F=82=E6=95=B0=E7=BB=99=E8=A1=A8=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B5=8B=E5=80=BC=E6=B2=A1=E6=9C=89=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1418020382015488]流程中自动化节点输出参数给表单组件赋值没有生效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1418020382015488
---
 .../job/callback/ProcessTaskCallbackHandler.java | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

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 c3f5c4dd8..4e158dc85 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<AutoexecJobVo> 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);
-//                }
-//            }
         }
     }
 
-- 
Gitee