From 93d84e18b2890066d28c28be84155bb32263d15e Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Fri, 13 Mar 2026 11:09:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SimulationNodeController.java  |  3 ++
 .../sdm/project/dao/SimulationNodeMapper.java |  2 +-
 .../project/service/impl/NodeServiceImpl.java |  3 +-
 .../resources/mapper/SimulationNodeMapper.xml | 35 +++++++++++++++++--
 4 files changed, 37 insertions(+), 6 deletions(-)

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 23385bd8..92d55cf3 100644
--- a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
+++ b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java
@@ -204,6 +204,9 @@ public class SimulationNodeController implements ISimulationNodeFeignClient {
 
     /**
      * 用户组项目统计
+     * 只统计 经理、负责人、执行人
+     * simulation_node_member   NodeMemberTypeEnum.MANAGER  经理
+     * simulation_task_member MemberTypeEnum.PRINCIPAL  负责人/  MemberTypeEnum.EXECUTOR
      */
     @GetMapping("/getUserGroupProjectStatistics")
     @Operation(summary = "用户组项目统计", description = "用户组项目统计")
diff --git a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
index fcc01439..9c831594 100644
--- a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
@@ -87,7 +87,7 @@ public interface SimulationNodeMapper extends BaseMapper<SimulationNode> {
 
     List<SpdmNodeVo> getNodeListByIds(@Param("nodeIdList") List<String> nodeIdList);
 
-    List<UserGroupProjectVo> getUserGroupProjectStatistics(@Param("userIds")Set<Long> userIds, @Param("tenantId")Long tenantId);
+    List<UserGroupProjectVo> getUserGroupProjectStatistics(@Param("userIds")Set<Long> userIds, @Param("tenantId")Long tenantId,@Param("nodeMemberTypeList") List<Integer> nodeMemberTypeList,@Param("taskMemberTypeList") List<Integer> taskMemberTypeList);
 
     List<UserGroupTaskCompleteVo> getUserGroupTaskCompleteStatistics(@Param("req") GetUserGroupTaskCompleteStatisticsReq req);
 
diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index 46729fb2..5cd9c5be 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -2580,8 +2580,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         }else {
             userIds.add(userId);
         }
-
-        List<UserGroupProjectVo> userGroupProjectStatistics = this.baseMapper.getUserGroupProjectStatistics(userIds,tenantId );
+        List<UserGroupProjectVo> userGroupProjectStatistics = this.baseMapper.getUserGroupProjectStatistics(userIds,tenantId, Collections.singletonList(NodeMemberTypeEnum.MANAGER.getCode()), Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode()));
         if (CollectionUtils.isEmpty(userGroupProjectStatistics)) {
             return SdmResponse.success(new ArrayList<>());
         }
diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml
index fb3e0d38..f3d43be9 100644
--- a/project/src/main/resources/mapper/SimulationNodeMapper.xml
+++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml
@@ -419,19 +419,48 @@
         )
     </select>
     <select id="getUserGroupProjectStatistics" resultType="com.sdm.project.model.vo.UserGroupProjectVo">
+        select distinct nodeId,userId from (
         select
         nodeId,
         user_id as userId
         from simulation_node_member
-        left join simulation_node on simulation_node_member.nodeId = simulation_node.uuid
+        join simulation_node on simulation_node_member.nodeId = simulation_node.uuid
         where
         simulation_node.tenantId = #{tenantId}
-         and
-            user_id in (
+        and
+        simulation_node_member.type in(
+        <foreach collection="nodeMemberTypeList" item="nodeMemberType" index="index" separator=",">#{nodeMemberType}
+        </foreach>
+        )
+        and
+        user_id in (
         <foreach collection='userIds' item='userId' index='index' separator=','>
             #{userId}
         </foreach>
         )
+
+        union
+
+        select
+        simulation_task.tag1 as nodeId,
+        simulation_task_member.user_id as userId
+        from simulation_task_member
+        join simulation_task on simulation_task.uuid = simulation_task_member.task_id
+        where
+        simulation_task.tenant_Id = #{tenantId}
+        and
+        simulation_task_member.type in(
+        <foreach collection="taskMemberTypeList" item="taskMemberType" index="index" separator=",">
+            #{taskMemberType}
+        </foreach>
+        )
+        and
+        simulation_task_member.user_id in (
+        <foreach collection='userIds' item='userId' index='index' separator=','>
+            #{userId}
+        </foreach>
+        )
+        ) as tmp
     </select>
 
     <select id="getUserGroupTaskCompleteStatistics"