From 1cb77d2adf934b5ed15ae763751a1ee459a571a5 Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Fri, 13 Mar 2026 15:02:44 +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 | 16 ++++++++++++- .../sdm/project/dao/SimulationNodeMapper.java | 6 ++--- .../project/service/impl/NodeServiceImpl.java | 6 ++--- .../resources/mapper/SimulationNodeMapper.xml | 24 ++++++++++++++++++- 4 files changed, 44 insertions(+), 8 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 92d55cf3..7af4d2e0 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationNodeController.java @@ -194,6 +194,9 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { /** * 所有项目的人员任务完成情况统计 + * 涉及 simulation_task + * 只统计 负责人、执行人 + * simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR 仿真执行人 */ @PostMapping("/getAllUserTaskCompleteStatistics") @Operation(summary = "所有项目的人员任务完成情况统计", description = "所有项目的人员任务完成情况统计") @@ -206,7 +209,7 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { * 用户组项目统计 * 只统计 经理、负责人、执行人 * simulation_node_member NodeMemberTypeEnum.MANAGER 经理 - * simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR + * simulation_task_member MemberTypeEnum.PRINCIPAL 仿真负责人/ MemberTypeEnum.EXECUTOR 仿真执行人 */ @GetMapping("/getUserGroupProjectStatistics") @Operation(summary = "用户组项目统计", description = "用户组项目统计") @@ -216,6 +219,11 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { /** * 用户组任务完成情况统计 + * 涉及 simulation_task.exe_status + * + * 只统计 负责人、执行人 + * simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR 仿真执行人 + * * 需要传： * discipline 学科 * tag1-tag10 标签 @@ -230,6 +238,12 @@ public class SimulationNodeController implements ISimulationNodeFeignClient { /** * 用户组难度系数统计 + * 涉及 simulation_task.difficult + * + * 只统计 负责人、执行人 + * simulation_task_member MemberTypeEnum.PRINCIPAL 负责人/ MemberTypeEnum.EXECUTOR 仿真执行人 + * + * * discipline 学科 * tag1-tag10 标签 * 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 9c831594..d9be0664 100644 --- a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java +++ b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java @@ -89,11 +89,11 @@ public interface SimulationNodeMapper extends BaseMapper { List getUserGroupProjectStatistics(@Param("userIds")Set userIds, @Param("tenantId")Long tenantId,@Param("nodeMemberTypeList") List nodeMemberTypeList,@Param("taskMemberTypeList") List taskMemberTypeList); - List getUserGroupTaskCompleteStatistics(@Param("req") GetUserGroupTaskCompleteStatisticsReq req); + List getUserGroupTaskCompleteStatistics(@Param("req") GetUserGroupTaskCompleteStatisticsReq req,@Param("taskMemberTypeList") List taskMemberTypeList); - List getAllUserTaskCompleteStatistics(@Param("req") GetAllUserTaskCompleteStatisticsReq req); + List getAllUserTaskCompleteStatistics(@Param("req") GetAllUserTaskCompleteStatisticsReq req,@Param("taskMemberTypeList") List taskMemberTypeList); - List getUserGroupDifficultyStatistics(@Param("req") GetUserGroupTaskCompleteStatisticsReq req); + List getUserGroupDifficultyStatistics(@Param("req") GetUserGroupTaskCompleteStatisticsReq req,@Param("taskMemberTypeList") List taskMemberTypeList); List getCommonCompleteStatisticsFromTask(@Param("req") CommonGetCompleteStatisticsReq 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 121505e7..459e7df7 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 @@ -2665,7 +2665,7 @@ public class NodeServiceImpl extends ServiceImpl userGroupTaskCompleteStatistics = this.baseMapper.getUserGroupTaskCompleteStatistics(req); + List userGroupTaskCompleteStatistics = this.baseMapper.getUserGroupTaskCompleteStatistics(req,Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode())); // 按用户分组统计任务状态 Map userStatisticsMap = new HashMap<>(); @@ -2720,7 +2720,7 @@ public class NodeServiceImpl extends ServiceImpl(); } - List userGroupTaskCompleteStatistics = this.baseMapper.getAllUserTaskCompleteStatistics(req); + List userGroupTaskCompleteStatistics = this.baseMapper.getAllUserTaskCompleteStatistics(req,Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode())); // 按用户分组统计任务状态 Map userStatisticsMap = new HashMap<>(); @@ -2771,7 +2771,7 @@ public class NodeServiceImpl extends ServiceImpl userGroupDifficultyStatistics = this.baseMapper.getUserGroupDifficultyStatistics(req); + List userGroupDifficultyStatistics = this.baseMapper.getUserGroupDifficultyStatistics(req,Arrays.asList(MemberTypeEnum.PRINCIPAL.getCode(),MemberTypeEnum.EXECUTOR.getCode())); // 按用户分组统计任务状态 Map userStatisticsMap = new HashMap<>(); diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml index f3d43be9..5c974ab1 100644 --- a/project/src/main/resources/mapper/SimulationNodeMapper.xml +++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml @@ -466,13 +466,21 @@