From 642f5e7b0bc6b1e671378dfe5e2169af22249ea5 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Mon, 16 Mar 2026 18:00:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=AF=BC=E5=87=BA=E6=8C=87=E6=A0=87=20bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../export/PerformanceAnalysisExportExcelParam.java   |  2 +-
 .../com/sdm/project/service/impl/TaskServiceImpl.java | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/sdm/common/entity/req/export/PerformanceAnalysisExportExcelParam.java b/common/src/main/java/com/sdm/common/entity/req/export/PerformanceAnalysisExportExcelParam.java
index 0aa1475c..a7da3654 100644
--- a/common/src/main/java/com/sdm/common/entity/req/export/PerformanceAnalysisExportExcelParam.java
+++ b/common/src/main/java/com/sdm/common/entity/req/export/PerformanceAnalysisExportExcelParam.java
@@ -31,7 +31,7 @@ public class PerformanceAnalysisExportExcelParam {
     private String disciplineNodeId;
 
     @Schema( description = "任务节点id")
-    private String taskNodeId;
+    private String taskId;
 
     @Schema( description = "算例id")
     private String runId;
diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
index 0ca43c7e..e99eb07a 100644
--- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
@@ -1879,6 +1879,10 @@ public class TaskServiceImpl implements ITaskService {
         taskReq.setCreateTime(null);
         taskReq.setStartTime(null);
         taskReq.setFinishTime(null);
+        TagReq performanceTagReq = taskReq.getTagReq();
+        if (performanceTagReq != null) {
+            performanceTagReq.setTaskId(req.getTaskNodeId());
+        }
         SdmResponse response = analysisTaskList(taskReq);
         if (ObjectUtils.isEmpty(response)) {
             log.info("指标查询中，未查询到任务1");
@@ -2035,8 +2039,10 @@ public class TaskServiceImpl implements ITaskService {
             }
             performanceNodePo.setRunName(simulationRun.getRunName());
             TagReq tagReq = performanceNodePo.getTagReq();
-            tagReq.setRunId(simulationRun.getUuid());
-            tagReq.setRunName(simulationRun.getRunName());
+            if (tagReq != null) {
+                tagReq.setRunId(simulationRun.getUuid());
+                tagReq.setRunName(simulationRun.getRunName());
+            }
         }
         jsonObject.put("data", performanceList);
         return SdmResponse.success(jsonObject);
@@ -4362,6 +4368,7 @@ public class TaskServiceImpl implements ITaskService {
         req.getParams().setSize(10000);
         SpdmAnalysisPerformanceListReq spdmAnalysisPerformanceListReq = new SpdmAnalysisPerformanceListReq();
         BeanUtils.copyProperties(req.getParams(), spdmAnalysisPerformanceListReq);
+        spdmAnalysisPerformanceListReq.setTaskNodeId(req.getParams().getTaskId());
         SdmResponse response = analysisPerformanceList(spdmAnalysisPerformanceListReq);
         if (ObjectUtils.isEmpty(response)) {
             log.error("exportRunByScript，未查询到任务1");