fix抽问抽答准确率排名的bug

airport-exam/src/main/java/com/sundot/airport/exam/dto/AccuracyStatisticsDTO.java

@@ -103,11 +103,26 @@ public class AccuracyStatisticsDTO implements Serializable {
     private RankingInfo teamInDeptRanking;
 
     /**
+     * 班组在大队中的排名
+     */
+    private RankingInfo teamInBrigadeRanking;
+
+    /**
      * 班组在站级中的排名
      */
     private RankingInfo teamInSiteRanking;
 
     /**
+     * 主管在大队中的排名
+     */
+    private RankingInfo deptInBrigadeRanking;
+
+    /**
+     * 大队在站级中的排名
+     */
+    private RankingInfo brigadeInSiteRanking;
+
+    /**
      * 主管内Top班组
      */
     private java.util.List<RankingItem> topTeamsInDept;
@@ -128,6 +143,16 @@ public class AccuracyStatisticsDTO implements Serializable {
     private java.util.List<RankingItem> bottomDepts;
 
     /**
+     * 大队正确率排名列表（站长视角）
+     */
+    private java.util.List<RankingItem> brigadeRankingList;
+
+    /**
+     * 本大队内Top班组（大队长视角）
+     */
+    private java.util.List<RankingItem> topTeamsInBrigade;
+
+    /**
      * 站级内Top班组
      */
     private java.util.List<RankingItem> topTeamsInSite;

airport-exam/src/main/java/com/sundot/airport/exam/service/impl/AccuracyStatisticsServiceImpl.java

@@ -14,7 +14,9 @@ import com.sundot.airport.common.enums.HomePageQueryEnum;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.MedalTypeEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.enums.TimeRangeEnum;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.exam.domain.DailyTask;
@@ -66,14 +68,21 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
 
     @Override
     public AccuracyStatisticsDTO getAccuracyStatistics(AccuracyStatisticsQueryDTO query) {
-        // 获取当前用户信息
+        // 获取当前用户信息（从登录信息中获取，确保包含角色信息）
         Long currentUserId = SecurityUtils.getUserId();
         Long currentDeptId = SecurityUtils.getDeptId();
-        SysUser currentUser = userService.selectUserById(currentUserId);
+        SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+
+        // 调试日志
+        log.info("getAccuracyStatistics - currentUserId: {}, currentDeptId: {}", currentUserId, currentDeptId);
+        log.info("getAccuracyStatistics - currentUser: {}", currentUser != null ? currentUser.getUserName() : "null");
+        log.info("getAccuracyStatistics - currentUser.getRoles(): {}", currentUser != null ? currentUser.getRoles() : "null");
 
         AccuracyStatisticsDTO result = new AccuracyStatisticsDTO();
 
-        // 设置用户角色
+        // 获取用户角色
+        String roleKey = getUserRoleKey(currentUser);
+        log.info("getAccuracyStatistics - roleKey: {}", roleKey);
         if (currentUser != null && currentUser.getRoles() != null && !currentUser.getRoles().isEmpty()) {
             result.setUserRole(currentUser.getRoles().get(0).getRoleName());
         }
@@ -95,21 +104,445 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
         // 检查是否有待完成任务
         checkPendingTask(result, currentUserId);
 
-        // 计算个人正确率
-        calculatePersonalAccuracy(result, currentUserId, startDate, endDate);
+        // 根据角色返回不同的数据
+        if (RoleTypeEnum.SecurityCheck.getCode().equals(roleKey)) {
+            // 安检员
+            calculateSecurityCheckData(result, currentUserId, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.banzuzhang.getCode().equals(roleKey)) {
+            // 班组长
+            calculateTeamLeaderData(result, currentUserId, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.kezhang.getCode().equals(roleKey)) {
+            // 主管
+            calculateManagerData(result, currentUserId, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.jingli.getCode().equals(roleKey) || RoleTypeEnum.xingzheng.getCode().equals(roleKey)) {
+            // 大队长（经理/行政）
+            calculateBrigadeLeaderData(result, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.test.getCode().equals(roleKey)) {
+            // 站长
+            calculateStationLeaderData(result, hierarchy, startDate, endDate);
+        } else {
+            // 其他角色：返回基本数据
+            calculatePersonalAccuracy(result, currentUserId, startDate, endDate);
+            calculateLevelAvgAccuracy(result, hierarchy, startDate, endDate);
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取用户的角色Key
+     */
+    private String getUserRoleKey(SysUser user) {
+        if (user == null || user.getRoles() == null || user.getRoles().isEmpty()) {
+            return null;
+        }
+        // 按优先级返回角色：站长 > 大队长 > 主管 > 班组长 > 安检员
+        List<String> roleKeys = user.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+        if (roleKeys.contains(RoleTypeEnum.test.getCode())) {
+            return RoleTypeEnum.test.getCode();
+        }
+        if (roleKeys.contains(RoleTypeEnum.jingli.getCode())) {
+            return RoleTypeEnum.jingli.getCode();
+        }
+        if (roleKeys.contains(RoleTypeEnum.xingzheng.getCode())) {
+            return RoleTypeEnum.xingzheng.getCode();
+        }
+        if (roleKeys.contains(RoleTypeEnum.kezhang.getCode())) {
+            return RoleTypeEnum.kezhang.getCode();
+        }
+        if (roleKeys.contains(RoleTypeEnum.banzuzhang.getCode())) {
+            return RoleTypeEnum.banzuzhang.getCode();
+        }
+        if (roleKeys.contains(RoleTypeEnum.SecurityCheck.getCode())) {
+            return RoleTypeEnum.SecurityCheck.getCode();
+        }
+        return user.getRoles().get(0).getRoleKey();
+    }
+
+    /**
+     * 安检员数据计算
+     * 正确率：本人、班平均、主管平均、大队平均、站平均
+     * 排名：班组排名、主管排名、大队排名、全站排名（个人排名）
+     */
+    private void calculateSecurityCheckData(AccuracyStatisticsDTO result, Long userId, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        // 个人正确率
+        calculatePersonalAccuracy(result, userId, startDate, endDate);
+
+        // 班平均、主管平均、大队平均、站平均
+        if (hierarchy.teamId != null) {
+            result.setTeamAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.teamId, startDate, endDate));
+        }
+        if (hierarchy.managerId != null) {
+            result.setDeptAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.managerId, startDate, endDate));
+        }
+        if (hierarchy.brigadeId != null) {
+            result.setBrigadeAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.brigadeId, startDate, endDate));
+        }
+        if (hierarchy.stationId != null) {
+            result.setSiteAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.stationId, startDate, endDate));
+        }
+
+        // 个人在各层级的排名
+        calculatePersonalRankings(result, userId, hierarchy, startDate, endDate);
+    }
+
+    /**
+     * 班组长数据计算
+     * 正确率：班平均、主管平均、大队平均、站平均
+     * 排名：主管排名、大队排名、全站排名（班组排名）
+     */
+    private void calculateTeamLeaderData(AccuracyStatisticsDTO result, Long userId, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        // 班平均、主管平均、大队平均、站平均
+        if (hierarchy.teamId != null) {
+            result.setTeamAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.teamId, startDate, endDate));
+        }
+        if (hierarchy.managerId != null) {
+            result.setDeptAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.managerId, startDate, endDate));
+        }
+        if (hierarchy.brigadeId != null) {
+            result.setBrigadeAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.brigadeId, startDate, endDate));
+        }
+        if (hierarchy.stationId != null) {
+            result.setSiteAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.stationId, startDate, endDate));
+        }
+
+        // 班组在主管中的排名
+        if (hierarchy.teamId != null && hierarchy.managerId != null) {
+            List<TeamAccuracyInfo> teamsInManager = calculateTeamAccuraciesUnderDept(hierarchy.managerId, startDate, endDate);
+            if (!teamsInManager.isEmpty()) {
+                result.setTeamInDeptRanking(findTeamRanking(hierarchy.teamId, teamsInManager));
+            }
+        }
+
+        // 班组在大队中的排名
+        if (hierarchy.teamId != null && hierarchy.brigadeId != null) {
+            List<TeamAccuracyInfo> teamsInBrigade = calculateTeamAccuraciesUnderDept(hierarchy.brigadeId, startDate, endDate);
+            if (!teamsInBrigade.isEmpty()) {
+                result.setTeamInBrigadeRanking(findTeamRanking(hierarchy.teamId, teamsInBrigade));
+            }
+        }
+
+        // 班组在全站中的排名
+        if (hierarchy.teamId != null && hierarchy.stationId != null) {
+            List<TeamAccuracyInfo> teamsInStation = calculateTeamAccuraciesUnderDept(hierarchy.stationId, startDate, endDate);
+            if (!teamsInStation.isEmpty()) {
+                result.setTeamInSiteRanking(findTeamRanking(hierarchy.teamId, teamsInStation));
+            }
+        }
+    }
+
+    /**
+     * 主管数据计算
+     * 正确率：主管平均、大队平均、站平均
+     * 排名：大队排名、全站排名（主管排名）
+     */
+    private void calculateManagerData(AccuracyStatisticsDTO result, Long userId, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        // 主管平均、大队平均、站平均
+        if (hierarchy.managerId != null) {
+            result.setDeptAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.managerId, startDate, endDate));
+        }
+        if (hierarchy.brigadeId != null) {
+            result.setBrigadeAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.brigadeId, startDate, endDate));
+        }
+        if (hierarchy.stationId != null) {
+            result.setSiteAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.stationId, startDate, endDate));
+        }
+
+        // 主管在大队中的排名
+        if (hierarchy.managerId != null && hierarchy.brigadeId != null) {
+            List<TeamAccuracyInfo> managersInBrigade = calculateManagerAccuraciesUnderBrigade(hierarchy.brigadeId, startDate, endDate);
+            if (!managersInBrigade.isEmpty()) {
+                result.setDeptInBrigadeRanking(findTeamRanking(hierarchy.managerId, managersInBrigade));
+            }
+        }
+
+        // 主管在全站中的排名
+        if (hierarchy.managerId != null && hierarchy.stationId != null) {
+            List<TeamAccuracyInfo> managersInStation = calculateManagerAccuraciesUnderStation(hierarchy.stationId, startDate, endDate);
+            if (!managersInStation.isEmpty()) {
+                result.setDeptInSiteRanking(findTeamRanking(hierarchy.managerId, managersInStation));
+            }
+        }
+    }
+
+    /**
+     * 大队长数据计算
+     * 正确率：大队平均、站平均
+     * 本大队抽问抽答正确率前三的班组
+     * 全站排名：大队排名/全站大队数总和
+     */
+    private void calculateBrigadeLeaderData(AccuracyStatisticsDTO result, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        // 大队平均、站平均
+        if (hierarchy.brigadeId != null) {
+            result.setBrigadeAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.brigadeId, startDate, endDate));
+        }
+        if (hierarchy.stationId != null) {
+            result.setSiteAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.stationId, startDate, endDate));
+        }
+
+        // 本大队抽问抽答正确率前三的班组
+        if (hierarchy.brigadeId != null) {
+            List<TeamAccuracyInfo> teamsInBrigade = calculateTeamAccuraciesUnderDept(hierarchy.brigadeId, startDate, endDate);
+            if (!teamsInBrigade.isEmpty()) {
+                List<AccuracyStatisticsDTO.RankingItem> topTeams = convertToTeamRankingItems(teamsInBrigade, 3, true, hierarchy.brigadeId);
+                result.setTopTeamsInBrigade(topTeams);
+            }
+        }
+
+        // 大队在全站中的排名
+        if (hierarchy.brigadeId != null && hierarchy.stationId != null) {
+            List<TeamAccuracyInfo> brigadesInStation = calculateBrigadeAccuraciesUnderStation(hierarchy.stationId, startDate, endDate);
+            if (!brigadesInStation.isEmpty()) {
+                result.setBrigadeInSiteRanking(findTeamRanking(hierarchy.brigadeId, brigadesInStation));
+            }
+        }
+    }
+
+    /**
+     * 站长数据计算
+     * 全站抽问抽答正确率
+     * 一二三大队排名（大队正确率排名）
+     * 主管正确率排名：正序前三名和倒序后三名
+     * 班组正确率排名：正序前三名和倒序后三名
+     */
+    private void calculateStationLeaderData(AccuracyStatisticsDTO result, DeptHierarchy hierarchy, Date startDate, Date endDate) {
+        // 全站平均正确率
+        if (hierarchy.stationId != null) {
+            result.setSiteAvgAccuracy(calculateDeptAvgAccuracy(hierarchy.stationId, startDate, endDate));
+        }
+
+        // 大队正确率排名列表
+        if (hierarchy.stationId != null) {
+            List<TeamAccuracyInfo> brigadesInStation = calculateBrigadeAccuraciesUnderStation(hierarchy.stationId, startDate, endDate);
+            if (!brigadesInStation.isEmpty()) {
+                List<AccuracyStatisticsDTO.RankingItem> brigadeRankingList = new ArrayList<>();
+                for (int i = 0; i < brigadesInStation.size(); i++) {
+                    TeamAccuracyInfo info = brigadesInStation.get(i);
+                    AccuracyStatisticsDTO.RankingItem item = new AccuracyStatisticsDTO.RankingItem();
+                    item.setId(info.deptId);
+                    item.setName(info.deptName);
+                    item.setAccuracy(info.accuracy);
+                    item.setRank(i + 1);
+                    brigadeRankingList.add(item);
+                }
+                result.setBrigadeRankingList(brigadeRankingList);
+            }
+
+            // 主管正确率排名：正序前三名和倒序后三名
+            List<TeamAccuracyInfo> managersInStation = calculateManagerAccuraciesUnderStation(hierarchy.stationId, startDate, endDate);
+            if (!managersInStation.isEmpty()) {
+                result.setTopDepts(convertToManagerRankingItems(managersInStation, 3, true));
+                result.setBottomDepts(convertToManagerRankingItems(managersInStation, 3, false));
+            }
+
+            // 班组正确率排名：正序前三名和倒序后三名
+            List<TeamAccuracyInfo> teamsInStation = calculateTeamAccuraciesUnderDept(hierarchy.stationId, startDate, endDate);
+            if (!teamsInStation.isEmpty()) {
+                result.setTopTeamsInSite(convertToTeamRankingItemsWithBrigade(teamsInStation, 3, true));
+                result.setBottomTeamsInSite(convertToTeamRankingItemsWithBrigade(teamsInStation, 3, false));
+            }
+        }
+    }
+
+    /**
+     * 计算大队下所有主管的正确率
+     */
+    private List<TeamAccuracyInfo> calculateManagerAccuraciesUnderBrigade(Long brigadeId, Date startDate, Date endDate) {
+        List<TeamAccuracyInfo> result = new ArrayList<>();
+
+        // 查询大队下所有主管
+        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+
+        for (SysDept dept : allDepts) {
+            if (!"0".equals(dept.getDelFlag())) {
+                continue;
+            }
+            if (!StrUtil.equals(DeptType.MANAGER.getCode(), dept.getDeptType())) {
+                continue;
+            }
+
+            // 检查是否属于该大队
+            if (brigadeId.equals(dept.getParentId())) {
+                TeamAccuracyInfo info = new TeamAccuracyInfo();
+                info.deptId = dept.getDeptId();
+                info.deptName = dept.getDeptName();
+
+                DeptHierarchy h = getDeptHierarchy(dept.getDeptId());
+                List<Long> teamIds = getTeamIdsUnderDept(dept.getDeptId(), h);
+
+                if (!teamIds.isEmpty()) {
+                    long[] counts = calculateAccuracyCountsForTeams(teamIds, startDate, endDate);
+                    if (counts[1] > 0) {
+                        info.accuracy = BigDecimal.valueOf(counts[0])
+                                .multiply(BigDecimal.valueOf(100))
+                                .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
+                    } else {
+                        info.accuracy = BigDecimal.ZERO;
+                    }
+                } else {
+                    info.accuracy = BigDecimal.ZERO;
+                }
+                result.add(info);
+            }
+        }
+
+        // 按正确率降序排序
+        result.sort((a, b) -> b.accuracy.compareTo(a.accuracy));
+
+        return result;
+    }
+
+    /**
+     * 计算站级下所有大队的正确率
+     */
+    private List<TeamAccuracyInfo> calculateBrigadeAccuraciesUnderStation(Long stationId, Date startDate, Date endDate) {
+        List<TeamAccuracyInfo> result = new ArrayList<>();
+
+        // 查询站级下所有大队
+        List<SysDept> allDepts = deptService.selectDeptInfoAll(new SysDept());
+
+        for (SysDept dept : allDepts) {
+            if (!"0".equals(dept.getDelFlag())) {
+                continue;
+            }
+            if (!StrUtil.equals(DeptType.BRIGADE.getCode(), dept.getDeptType())) {
+                continue;
+            }
+
+            // 检查是否属于该站级
+            if (stationId.equals(dept.getParentId())) {
+                TeamAccuracyInfo info = new TeamAccuracyInfo();
+                info.deptId = dept.getDeptId();
+                info.deptName = dept.getDeptName();
+
+                DeptHierarchy h = getDeptHierarchy(dept.getDeptId());
+                List<Long> teamIds = getTeamIdsUnderDept(dept.getDeptId(), h);
+
+                if (!teamIds.isEmpty()) {
+                    long[] counts = calculateAccuracyCountsForTeams(teamIds, startDate, endDate);
+                    if (counts[1] > 0) {
+                        info.accuracy = BigDecimal.valueOf(counts[0])
+                                .multiply(BigDecimal.valueOf(100))
+                                .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
+                    } else {
+                        info.accuracy = BigDecimal.ZERO;
+                    }
+                } else {
+                    info.accuracy = BigDecimal.ZERO;
+                }
+                result.add(info);
+            }
+        }
+
+        // 按正确率降序排序
+        result.sort((a, b) -> b.accuracy.compareTo(a.accuracy));
+
+        return result;
+    }
 
-        // 计算各层级平均正确率
-        calculateLevelAvgAccuracy(result, hierarchy, startDate, endDate);
+    /**
+     * 将班组排名转换为带大队名称的格式
+     */
+    private List<AccuracyStatisticsDTO.RankingItem> convertToTeamRankingItems(List<TeamAccuracyInfo> rankings, int limit, boolean fromTop, Long brigadeId) {
+        List<AccuracyStatisticsDTO.RankingItem> result = new ArrayList<>();
 
-        // 计算个人在各层级的排名
-        calculatePersonalRankings(result, currentUserId, hierarchy, startDate, endDate);
+        if (rankings.isEmpty()) {
+            return result;
+        }
 
-        // 计算班组/部门级别排名
-        calculateTeamAndDeptRankings(result, hierarchy, startDate, endDate);
+        int size = rankings.size();
+        int actualLimit = Math.min(limit, size);
+
+        if (fromTop) {
+            for (int i = 0; i < actualLimit; i++) {
+                TeamAccuracyInfo info = rankings.get(i);
+                AccuracyStatisticsDTO.RankingItem item = new AccuracyStatisticsDTO.RankingItem();
+                item.setId(info.deptId);
+                item.setName(info.deptName);
+                item.setAccuracy(info.accuracy);
+                item.setRank(i + 1);
+                result.add(item);
+            }
+        } else {
+            for (int i = size - actualLimit; i < size; i++) {
+                TeamAccuracyInfo info = rankings.get(i);
+                AccuracyStatisticsDTO.RankingItem item = new AccuracyStatisticsDTO.RankingItem();
+                item.setId(info.deptId);
+                item.setName(info.deptName);
+                item.setAccuracy(info.accuracy);
+                item.setRank(i + 1);
+                result.add(item);
+            }
+        }
 
         return result;
     }
 
+    /**
+     * 将班组排名转换为带大队名称的格式（站长视角）
+     * 格式如"一大队张三班组"
+     */
+    private List<AccuracyStatisticsDTO.RankingItem> convertToTeamRankingItemsWithBrigade(List<TeamAccuracyInfo> rankings, int limit, boolean fromTop) {
+        List<AccuracyStatisticsDTO.RankingItem> result = new ArrayList<>();
+
+        if (rankings.isEmpty()) {
+            return result;
+        }
+
+        int size = rankings.size();
+        int actualLimit = Math.min(limit, size);
+
+        if (fromTop) {
+            for (int i = 0; i < actualLimit; i++) {
+                TeamAccuracyInfo info = rankings.get(i);
+                AccuracyStatisticsDTO.RankingItem item = new AccuracyStatisticsDTO.RankingItem();
+                item.setId(info.deptId);
+                item.setName(getTeamDisplayNameWithBrigade(info.deptId, info.deptName));
+                item.setAccuracy(info.accuracy);
+                item.setRank(i + 1);
+                result.add(item);
+            }
+        } else {
+            for (int i = size - actualLimit; i < size; i++) {
+                TeamAccuracyInfo info = rankings.get(i);
+                AccuracyStatisticsDTO.RankingItem item = new AccuracyStatisticsDTO.RankingItem();
+                item.setId(info.deptId);
+                item.setName(getTeamDisplayNameWithBrigade(info.deptId, info.deptName));
+                item.setAccuracy(info.accuracy);
+                item.setRank(i + 1);
+                result.add(item);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取班组显示名称，格式为"大队名+班组名"，如"一大队张三班组"
+     */
+    private String getTeamDisplayNameWithBrigade(Long teamId, String teamName) {
+        SysDept teamDept = deptService.selectDeptById(teamId);
+        if (teamDept == null) {
+            return teamName;
+        }
+        // 获取班组所属的主管
+        Long managerId = teamDept.getParentId();
+        if (managerId != null) {
+            SysDept managerDept = deptService.selectDeptById(managerId);
+            if (managerDept != null) {
+                // 获取主管所属的大队
+                Long brigadeId = managerDept.getParentId();
+                if (brigadeId != null) {
+                    SysDept brigadeDept = deptService.selectDeptById(brigadeId);
+                    if (brigadeDept != null && StrUtil.equals(DeptType.BRIGADE.getCode(), brigadeDept.getDeptType())) {
+                        return brigadeDept.getDeptName() + teamName;
+                    }
+                }
+            }
+        }
+        return teamName;
+    }
+
     @Override
     public AccuracyStatisticsDTO getUserAccuracyStatistics(Long userId, AccuracyStatisticsQueryDTO query) {
         SysUser user = userService.selectUserById(userId);
@@ -119,7 +552,8 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
 
         AccuracyStatisticsDTO result = new AccuracyStatisticsDTO();
 
-        // 设置用户角色
+        // 获取用户角色
+        String roleKey = getUserRoleKey(user);
         if (user.getRoles() != null && !user.getRoles().isEmpty()) {
             result.setUserRole(user.getRoles().get(0).getRoleName());
         }
@@ -141,17 +575,27 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
         // 检查是否有待完成任务
         checkPendingTask(result, userId);
 
-        // 计算个人正确率
-        calculatePersonalAccuracy(result, userId, startDate, endDate);
-
-        // 计算各层级平均正确率
-        calculateLevelAvgAccuracy(result, hierarchy, startDate, endDate);
-
-        // 计算个人在各层级的排名
-        calculatePersonalRankings(result, userId, hierarchy, startDate, endDate);
-
-        // 计算班组/部门级别排名
-        calculateTeamAndDeptRankings(result, hierarchy, startDate, endDate);
+        // 根据角色返回不同的数据
+        if (RoleTypeEnum.SecurityCheck.getCode().equals(roleKey)) {
+            // 安检员
+            calculateSecurityCheckData(result, userId, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.banzuzhang.getCode().equals(roleKey)) {
+            // 班组长
+            calculateTeamLeaderData(result, userId, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.kezhang.getCode().equals(roleKey)) {
+            // 主管
+            calculateManagerData(result, userId, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.jingli.getCode().equals(roleKey) || RoleTypeEnum.xingzheng.getCode().equals(roleKey)) {
+            // 大队长（经理/行政）
+            calculateBrigadeLeaderData(result, hierarchy, startDate, endDate);
+        } else if (RoleTypeEnum.test.getCode().equals(roleKey)) {
+            // 站长
+            calculateStationLeaderData(result, hierarchy, startDate, endDate);
+        } else {
+            // 其他角色：返回基本数据
+            calculatePersonalAccuracy(result, userId, startDate, endDate);
+            calculateLevelAvgAccuracy(result, hierarchy, startDate, endDate);
+        }
 
         return result;
     }
@@ -551,20 +995,28 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
 
     /**
      * 计算用户在指定部门范围内的排名
+     * 如果用户没有答题记录，将其视为正确率0排在最后
      */
     private AccuracyStatisticsDTO.RankingInfo calculateUserRankingInDept(Long userId, Long deptId, Date startDate, Date endDate) {
         DeptHierarchy hierarchy = getDeptHierarchy(deptId);
         List<Long> teamIds = getTeamIdsUnderDept(deptId, hierarchy);
 
+        AccuracyStatisticsDTO.RankingInfo rankingInfo = new AccuracyStatisticsDTO.RankingInfo();
+
         if (teamIds.isEmpty()) {
-            return null;
+            rankingInfo.setRank(1);
+            rankingInfo.setTotal(1);
+            return rankingInfo;
         }
 
         // 获取这些班组下所有用户的正确率
         List<UserAccuracyInfo> userAccuracies = calculateUserAccuraciesInTeams(teamIds, startDate, endDate);
 
         if (userAccuracies.isEmpty()) {
-            return null;
+            // 没有任何人答题，当前用户排第1
+            rankingInfo.setRank(1);
+            rankingInfo.setTotal(1);
+            return rankingInfo;
         }
 
         // 按正确率降序排序
@@ -579,9 +1031,15 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             }
         }
 
-        AccuracyStatisticsDTO.RankingInfo rankingInfo = new AccuracyStatisticsDTO.RankingInfo();
-        rankingInfo.setRank(rank > 0 ? rank : null);
-        rankingInfo.setTotal(userAccuracies.size());
+        // 如果找不到当前用户，说明该用户没有答题记录，排在最后（正确率为0）
+        if (rank == 0) {
+            rank = userAccuracies.size() + 1;
+            rankingInfo.setRank(rank);
+            rankingInfo.setTotal(userAccuracies.size() + 1);
+        } else {
+            rankingInfo.setRank(rank);
+            rankingInfo.setTotal(userAccuracies.size());
+        }
         return rankingInfo;
     }
 
@@ -1089,16 +1547,19 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
                 continue;
             }
 
+            TeamAccuracyInfo info = new TeamAccuracyInfo();
+            info.deptId = teamId;
+            info.deptName = teamDept.getDeptName();
+
             long[] counts = calculateAccuracyCountsForTeams(Collections.singletonList(teamId), startDate, endDate);
             if (counts[1] > 0) {
-                TeamAccuracyInfo info = new TeamAccuracyInfo();
-                info.deptId = teamId;
-                info.deptName = teamDept.getDeptName();
                 info.accuracy = BigDecimal.valueOf(counts[0])
                         .multiply(BigDecimal.valueOf(100))
                         .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
-                result.add(info);
+            } else {
+                info.accuracy = BigDecimal.ZERO;
             }
+            result.add(info);
         }
 
         // 按正确率降序排序
@@ -1138,21 +1599,26 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
                 continue;
             }
 
+            TeamAccuracyInfo info = new TeamAccuracyInfo();
+            info.deptId = managerId;
+            info.deptName = managerDept.getDeptName();
+
             DeptHierarchy h = getDeptHierarchy(managerId);
             List<Long> teamIds = getTeamIdsUnderDept(managerId, h);
 
             if (!teamIds.isEmpty()) {
                 long[] counts = calculateAccuracyCountsForTeams(teamIds, startDate, endDate);
                 if (counts[1] > 0) {
-                    TeamAccuracyInfo info = new TeamAccuracyInfo();
-                    info.deptId = managerId;
-                    info.deptName = managerDept.getDeptName();
                     info.accuracy = BigDecimal.valueOf(counts[0])
                             .multiply(BigDecimal.valueOf(100))
                             .divide(BigDecimal.valueOf(counts[1]), 2, RoundingMode.HALF_UP);
-                    result.add(info);
+                } else {
+                    info.accuracy = BigDecimal.ZERO;
                 }
+            } else {
+                info.accuracy = BigDecimal.ZERO;
             }
+            result.add(info);
         }
 
         // 按正确率降序排序
@@ -1163,10 +1629,15 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
 
     /**
      * 在排名列表中查找指定部门的排名
+     * 如果部门不在列表中（无答题记录），将其视为正确率0排在最后
      */
     private AccuracyStatisticsDTO.RankingInfo findTeamRanking(Long deptId, List<TeamAccuracyInfo> rankings) {
+        AccuracyStatisticsDTO.RankingInfo rankingInfo = new AccuracyStatisticsDTO.RankingInfo();
+
         if (rankings.isEmpty()) {
-            return null;
+            rankingInfo.setRank(1);
+            rankingInfo.setTotal(1);
+            return rankingInfo;
         }
 
         int rank = 0;
@@ -1177,9 +1648,15 @@ public class AccuracyStatisticsServiceImpl implements IAccuracyStatisticsService
             }
         }
 
-        AccuracyStatisticsDTO.RankingInfo rankingInfo = new AccuracyStatisticsDTO.RankingInfo();
-        rankingInfo.setRank(rank > 0 ? rank : null);
-        rankingInfo.setTotal(rankings.size());
+        // 如果找不到，说明该部门没有答题记录，排在最后（正确率为0）
+        if (rank == 0) {
+            rank = rankings.size() + 1;
+            rankingInfo.setRank(rank);
+            rankingInfo.setTotal(rankings.size() + 1);
+        } else {
+            rankingInfo.setRank(rank);
+            rankingInfo.setTotal(rankings.size());
+        }
         return rankingInfo;
     }