From 597a015ffd4c554f3bc1244d7a1668d2cbf535f7 Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Wed, 18 Mar 2026 11:17:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdm/project/controller/SimulationNodeController.java | 4 ++++
 .../src/main/resources/mapper/SimulationNodeMapper.xml   | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
index 7af4d2e0..7ab4a5e4 100644
--- a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
+++ b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
@@ -261,6 +261,8 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
      * queryType 查询统计类型 任务/指标:task/performance
      * tag1-tag10 标签
      * resultTagType X轴(工位对应的tag)数据返回对应的Tag类型: tag1、tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10
+     *
+     * 只查询任务的指标完成情况，不统计算列的指标完成情况
      */
     @PostMapping("/getCommonCompleteStatistics")
     @Operation(summary = "任务/指标 完成情况统计请求参数(工位)", description = "任务/指标 完成情况统计请求参数(工位)")
@@ -284,6 +286,8 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
     /** 基于 学科（学科不是节点，是task的一个属性）查询（指标）完成统计
      * 需要传：
      * tag1-tag10 标签
+     *
+     *只查询任务的指标完成情况，不统计算列的指标完成情况
      */
     @PostMapping("/getPerformanceCompleteStatisticsByDiscipline")
     @Operation(summary = "基于 学科（学科不是节点，是task的一个属性）查询 指标 完成统计", description = "基于 学科（学科不是节点，是task的一个属性）查询（任务/指标）完成统计")
diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml
index 47cba006..a65d2a45 100644
--- a/project/src/main/resources/mapper/SimulationNodeMapper.xml
+++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml
@@ -529,7 +529,10 @@
     <select id="getAllUserTaskCompleteStatistics"
             parameterType="com.sdm.project.model.req.GetAllUserTaskCompleteStatisticsReq"
             resultType="com.sdm.project.model.vo.UserGroupTaskCompleteVo">
-        select task.exe_status as exeStatus,
+        select
+        distinct
+        task.uuid,
+        task.exe_status as exeStatus,
         task_member.user_id as userId
         from simulation_task task
         left join simulation_task_member task_member on task.uuid = task_member.task_id
@@ -685,6 +688,8 @@
             and
             performance.completeStatus is not null
             and
+            (performance.runId  is null or performance.runId = '')
+            and
             task.tenant_Id = #{req.tenantId}
             <if test="req.tag1 != null and req.tag1 !='' ">
                 and task.tag1 = #{req.tag1}
@@ -729,6 +734,8 @@
         left join simulation_performance performance on performance.taskId = task.uuid
         <where>
             performance.completeStatus is not null
+            and
+            (performance.runId  is null or performance.runId = '')
             and task.discipline is not null
             and task.discipline != ''
             and task.tenant_Id = #{req.tenantId}