From 0bc18c25ec59a70ee92cd4a0c88fd96558c86a4e Mon Sep 17 00:00:00 2001
From: chenjg <17688741996@163.com>
Date: Fri, 19 Jul 2024 18:40:37 +0800
Subject: [PATCH] =?UTF-8?q?#[1199127977754624]=E5=8F=91=E5=B8=83=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E9=87=8C?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AD=97=E6=AE=B5=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/11991279777?=
 =?UTF-8?q?54624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/AutoexecJobPhaseNodeSearchApi.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/autoexec/api/job/AutoexecJobPhaseNodeSearchApi.java b/src/main/java/neatlogic/module/autoexec/api/job/AutoexecJobPhaseNodeSearchApi.java
index 83937f70..b5fcbdb7 100644
--- a/src/main/java/neatlogic/module/autoexec/api/job/AutoexecJobPhaseNodeSearchApi.java
+++ b/src/main/java/neatlogic/module/autoexec/api/job/AutoexecJobPhaseNodeSearchApi.java
@@ -20,11 +20,14 @@ import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.autoexec.auth.AUTOEXEC_BASE;
 import neatlogic.framework.autoexec.constvalue.JobStatus;
 import neatlogic.framework.autoexec.dao.mapper.AutoexecJobMapper;
+import neatlogic.framework.autoexec.dto.job.AutoexecJobInvokeVo;
 import neatlogic.framework.autoexec.dto.job.AutoexecJobPhaseNodeVo;
 import neatlogic.framework.autoexec.dto.job.AutoexecJobPhaseVo;
 import neatlogic.framework.autoexec.dto.job.AutoexecJobVo;
 import neatlogic.framework.autoexec.exception.AutoexecJobNotFoundException;
 import neatlogic.framework.autoexec.exception.AutoexecJobPhaseNotFoundException;
+import neatlogic.framework.autoexec.job.source.type.AutoexecJobSourceTypeHandlerFactory;
+import neatlogic.framework.autoexec.job.source.type.IAutoexecJobSourceTypeHandler;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.common.dto.BasePageVo;
 import neatlogic.framework.restful.annotation.*;
@@ -92,7 +95,21 @@ public class AutoexecJobPhaseNodeSearchApi extends PrivateApiComponentBase {
         if (rowNum > 0) {
             jobPhaseNodeVoList = autoexecJobMapper.searchJobPhaseNodeWithResource(jobPhaseNodeVo);
         }
-        JSONObject result = TableResultUtil.getResult(jobPhaseNodeVoList, jobPhaseNodeVo);
+        JSONObject result = null;
+        // 补充剧本节点额外信息
+        AutoexecJobInvokeVo invokeVo = autoexecJobMapper.getJobInvokeByJobId(phaseVo.getJobId());
+        if (invokeVo != null) {
+            IAutoexecJobSourceTypeHandler autoexecJobSourceActionHandler = AutoexecJobSourceTypeHandlerFactory.getAction(invokeVo.getType());
+            if (autoexecJobSourceActionHandler != null) {
+                List<JSONObject> jobPhaseNodeObjectList = autoexecJobSourceActionHandler.getExtraJobPhaseNoneInfo(phaseVo.getJobId(), jobPhaseNodeVoList);
+                if (jobPhaseNodeObjectList != null && !jobPhaseNodeObjectList.isEmpty()) {
+                    result = TableResultUtil.getResult(jobPhaseNodeObjectList, jobPhaseNodeVo);
+                }
+            }
+        }
+        if (result == null) {
+            result = TableResultUtil.getResult(jobPhaseNodeVoList, jobPhaseNodeVo);
+        }
         result.put("status", jobVo.getStatus());
         result.put("statusName", JobStatus.getText(jobVo.getStatus()));
         return result;
-- 
Gitee