质控分析报告-勤务组织/风险隐患-部门或用户筛选功能

airport-admin/src/main/java/com/sundot/airport/web/controller/quality/ItemCategoryStatsController.java

@@ -96,6 +96,11 @@ public class ItemCategoryStatsController extends BaseController {
             dto.setStartDate(timeParams.getStartTime());
             dto.setEndDate(timeParams.getEndTime());
             dto.setInspectStationId(topSiteId);
+            // 设置大队、科室、班、人员筛选条件
+            dto.setInspectBrigadeId(params.getBrigadeId());
+            dto.setInspectDepartmentId(params.getDepartmentId());
+            dto.setInspectTeamId(params.getTeamId());
+            dto.setUserId(params.getUserId());
             List<ItemLargeScreenTimeSpanDto> result = itemLargeScreenService.appTimeSpan(dto);
             return AjaxResult.success("获取成功", result);
 
@@ -182,7 +187,7 @@ public class ItemCategoryStatsController extends BaseController {
 
 
     /**
-     * "各大队查获排名
+     * 各大队查获排名
      */
     @ApiOperation("获取各大队查获排名")
     @GetMapping("/brigade-ranking")
@@ -264,6 +269,12 @@ public class ItemCategoryStatsController extends BaseController {
         dto.setStartDate(timeParams.getStartTime());
         dto.setEndDate(timeParams.getEndTime());
 
+        // 设置大队、科室、班、人员筛选条件
+        dto.setInspectBrigadeId(params.getBrigadeId());
+        dto.setInspectDepartmentId(params.getDepartmentId());
+        dto.setInspectTeamId(params.getTeamId());
+        dto.setUserId(params.getUserId());
+
         return dto;
     }
 

airport-admin/src/main/java/com/sundot/airport/web/controller/quality/QualificationLevelStatsController.java

@@ -11,12 +11,14 @@ import com.sundot.airport.system.domain.QualificationLevelConverter;
 import com.sundot.airport.system.domain.portrait.QualificationStats;
 import com.sundot.airport.system.mapper.portrait.QualificationLevelIndicatorMapper;
 import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysPostService;
 import com.sundot.airport.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
@@ -49,6 +51,9 @@ public class QualificationLevelStatsController extends BaseController {
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private ISysPostService sysPostService;
+
 
     /**
      * 固定的资质等级列表（初级、中级、高级）
@@ -58,25 +63,34 @@ public class QualificationLevelStatsController extends BaseController {
     );
 
     /**
-     * 获取饼状图数据（全站资质等级分布）
+     * 获取饼状图数据（资质等级分布）
+     * 支持按部门 ID、用户 ID 进行统计
      */
     @ApiOperation("获取饼状图数据")
     @GetMapping("/pie-chart")
-    public AjaxResult getPieChartData() {
+    public AjaxResult getPieChartData(
+            @RequestParam(required = false) Long deptId) {
 
         try {
-            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
-            if (topSiteId == null) {
-                return AjaxResult.error("无法找到有效的站点信息");
+            List<Long> targetUserIds;
+
+            if (deptId != null) {
+                // 按部门（大队/科室/班组）统计
+                targetUserIds = getAllUserIdsUnderDept(deptId);
+            } else {
+                // 默认按全站统计
+                Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+                if (topSiteId == null) {
+                    return AjaxResult.error("无法找到有效的站点信息");
+                }
+                targetUserIds = getAllUserIdsUnderSite(topSiteId);
             }
 
-            List<Long> siteUserIds = getAllUserIdsUnderSite(topSiteId);
-            if (siteUserIds.isEmpty()) {
+            if (targetUserIds.isEmpty()) {
                 return AjaxResult.success("获取成功", new QualificationLevelStatsDTO.PieChartData());
             }
 
-
-            QualificationLevelStatsDTO.PieChartData pieChart = calculatePieChartData(siteUserIds);
+            QualificationLevelStatsDTO.PieChartData pieChart = calculatePieChartData(targetUserIds);
             return AjaxResult.success("获取成功", pieChart);
 
         } catch (Exception e) {
@@ -86,19 +100,34 @@ public class QualificationLevelStatsController extends BaseController {
     }
 
     /**
-     * 获取柱状图数据（各大队资质等级分布）
+     * 获取柱状图数据（资质等级分布）
+     * 支持按大队ID、科室ID、班组ID、用户ID 进行统计
      */
     @ApiOperation("获取柱状图数据")
     @GetMapping("/bar-chart")
-    public AjaxResult getBarChartData() {
+    public AjaxResult getBarChartData(
+            @RequestParam(required = false) Long deptId,
+            @RequestParam(required = false) Long userId) {
 
         try {
-            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
-            if (topSiteId == null) {
-                return AjaxResult.error("无法找到有效的站点信息");
+            QualificationLevelStatsDTO.BarChartData barChart;
+
+            // 优先处理用户 ID 参数
+            if (userId != null) {
+                // 按个人统计，返回该用户的资质等级
+                barChart = calculateBarChartDataForUser(userId);
+            } else if (deptId != null) {
+                // 按部门 ID 统计，根据部门类型决定返回逻辑
+                barChart = calculateBarChartDataForDept(deptId);
+            } else {
+                // 未传参，默认统计全站下各科室的分布
+                Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(getDeptId()));
+                if (topSiteId == null) {
+                    return AjaxResult.error("无法找到有效的站点信息");
+                }
+                barChart = calculateBarChartDataOptimized(topSiteId);
             }
 
-            QualificationLevelStatsDTO.BarChartData barChart = calculateBarChartDataOptimized(topSiteId);
             return AjaxResult.success("获取成功", barChart);
 
         } catch (Exception e) {
@@ -171,6 +200,176 @@ public class QualificationLevelStatsController extends BaseController {
     }
 
     /**
+     * 计算柱状图数据
+     * - 站级/大队级/科级：返回下属组织的资质等级统计
+     * - 班组：返回班组内每个员工的资质等级
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataForDept(Long deptId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        SysDept sysDept = sysDeptService.selectDeptById(deptId);
+        if (sysDept == null) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        List<SysDept> targetDepts = new ArrayList<>();
+
+        // 根据部门类型决定查询逻辑
+        if (DeptTypeEnum.TEAMS.getCode().equals(sysDept.getDeptType())) {
+            // 班组级别：查询该班组下的所有用户，返回每个人的资质等级
+            return calculateBarChartDataForTeam(deptId);
+        } else {
+            // 站级/大队级/科级：查询该部门下的所有子部门
+            List<SysDept> children = sysDeptService.selectChildrenDeptById(deptId);
+            if (DeptTypeEnum.MANAGER.getCode().equals(sysDept.getDeptType())) {
+                targetDepts.addAll(children.stream()
+                        .filter(dept -> DeptTypeEnum.TEAMS.getCode().equals(dept.getDeptType()))
+                        .collect(Collectors.toList()));
+            } else if (DeptTypeEnum.BRIGADE.getCode().equals(sysDept.getDeptType())) {
+                targetDepts.addAll(children.stream()
+                        .filter(dept -> DeptTypeEnum.MANAGER.getCode().equals(dept.getDeptType()))
+                        .collect(Collectors.toList()));
+            } else if (DeptTypeEnum.STATION.getCode().equals(sysDept.getDeptType())) {
+                targetDepts.addAll(children.stream()
+                        .filter(dept -> DeptTypeEnum.BRIGADE.getCode().equals(dept.getDeptType()))
+                        .collect(Collectors.toList()));
+
+            }
+            if (targetDepts.isEmpty()) {
+                barChart.setBrigades(new ArrayList<>());
+                return barChart;
+            }
+        }
+
+        // 批量获取所有子部门的用户 ID
+        Map<Long, List<Long>> deptUserIdsMap = batchGetUserIdsByBrigades(targetDepts);
+
+        // 批量查询所有子部门的资质统计数据
+        Map<Long, List<QualificationStats>> deptStatsMap = batchQueryQualificationStats(deptUserIdsMap);
+
+        // 构建部门数据
+        List<QualificationLevelStatsDTO.BrigadeData> deptDataList = targetDepts.stream()
+                .map(dept -> {
+                    QualificationLevelStatsDTO.BrigadeData deptData = new QualificationLevelStatsDTO.BrigadeData();
+                    deptData.setDeptId(dept.getDeptId());
+                    deptData.setDeptName(dept.getDeptName());
+
+                    List<QualificationStats> deptStats = deptStatsMap.get(dept.getDeptId());
+                    if (deptStats != null && !deptStats.isEmpty()) {
+                        List<QualificationLevelStatsDTO.LevelCount> levelCounts = convertToLevelCounts(deptStats);
+                        deptData.setLevelCounts(levelCounts);
+                    } else {
+                        // 部门无用户或无统计数据，初始化为空数据
+                        List<QualificationLevelStatsDTO.LevelCount> emptyCounts = QUALIFICATION_LEVELS.stream()
+                                .map(level -> {
+                                    QualificationLevelStatsDTO.LevelCount count = new QualificationLevelStatsDTO.LevelCount();
+                                    count.setLevelName(level);
+                                    count.setCount(0);
+                                    return count;
+                                })
+                                .collect(Collectors.toList());
+                        deptData.setLevelCounts(emptyCounts);
+                    }
+
+                    return deptData;
+                })
+                .collect(Collectors.toList());
+
+        barChart.setBrigades(deptDataList);
+        return barChart;
+    }
+
+    /**
+     * 计算班组的柱状图数据（返回班组内每个员工的资质等级）
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataForTeam(Long teamId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        // 获取班组下的所有用户
+        List<Long> userIds = getAllUserIdsUnderDept(teamId);
+
+        if (userIds.isEmpty()) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        // 查询每个用户的资质等级
+        List<QualificationLevelStatsDTO.BrigadeData> userDataList = new ArrayList<>();
+        for (Long uid : userIds) {
+            SysUser user = sysUserService.selectUserById(uid);
+            if (user == null || "2".equals(user.getDelFlag()) || "1".equals(user.getStatus())) {
+                continue; // 跳过已删除或停用的用户
+            }
+
+            // 查询该用户的资质等级
+            String level = qualificationLevelMapper.queryPersonalQualificationLevel(uid);
+            String displayLevel = convertToDisplayLevel(level);
+
+            QualificationLevelStatsDTO.BrigadeData userData = new QualificationLevelStatsDTO.BrigadeData();
+            userData.setDeptId(uid); // 使用用户 ID 作为标识
+            userData.setDeptName(user.getNickName() != null ? user.getNickName() : user.getUserName());
+            userData.setQualificationLevel(displayLevel); // 直接设置资质等级
+
+            userDataList.add(userData);
+        }
+
+        barChart.setBrigades(userDataList);
+        return barChart;
+    }
+
+    /**
+     * 计算个人的柱状图数据（返回单个用户的资质等级）
+     */
+    private QualificationLevelStatsDTO.BarChartData calculateBarChartDataForUser(Long userId) {
+        QualificationLevelStatsDTO.BarChartData barChart = new QualificationLevelStatsDTO.BarChartData();
+
+        SysUser user = sysUserService.selectUserById(userId);
+        if (user == null || "2".equals(user.getDelFlag()) || "1".equals(user.getStatus())) {
+            barChart.setBrigades(new ArrayList<>());
+            return barChart;
+        }
+
+        // 查询该用户的资质等级
+        String level = qualificationLevelMapper.queryPersonalQualificationLevel(userId);
+        String displayLevel = convertToDisplayLevel(level);
+
+        // 构建用户数据
+        QualificationLevelStatsDTO.BrigadeData userData = new QualificationLevelStatsDTO.BrigadeData();
+        userData.setDeptId(userId);
+        userData.setDeptName(user.getNickName() != null ? user.getNickName() : user.getUserName());
+        userData.setQualificationLevel(displayLevel); // 直接设置资质等级
+        userData.setSysPostList(sysPostService.selectPostListsByUserId(userId));
+
+        List<QualificationLevelStatsDTO.BrigadeData> departments = new ArrayList<>();
+        departments.add(userData);
+        barChart.setBrigades(departments);
+
+        return barChart;
+    }
+
+    /**
+     * 将数据库枚举值转换为显示名称
+     */
+    private String convertToDisplayLevel(String dbValue) {
+        if (dbValue == null || dbValue.trim().isEmpty()) {
+            return null;
+        }
+        switch (dbValue.toUpperCase()) {
+            case "LEVEL_FIVE":
+                return "初级";
+            case "LEVEL_FOUR":
+                return "中级";
+            case "LEVEL_ONE":
+            case "LEVEL_TWO":
+            case "LEVEL_THREE":
+                return "高级";
+            default:
+                return dbValue;
+        }
+    }
+
+    /**
      * 计算柱状图数据（各大队资质等级分布）
      */
     private QualificationLevelStatsDTO.BarChartData calculateBarChartDataOptimized(Long siteId) {
@@ -333,22 +532,10 @@ public class QualificationLevelStatsController extends BaseController {
      * 获取部门下的所有用户ID
      */
     private List<Long> getAllUserIdsUnderDept(Long deptId) {
-        List<Long> userIds = new ArrayList<>();
-
-        // 获取部门本身及其下属部门
-        List<SysDept> allDepts = sysDeptService.selectChildrenDeptById(deptId);
-        allDepts.add(0, sysDeptService.selectDeptById(deptId)); // 添加部门本身
-
-        // 获取各部门下的用户
-        for (SysDept dept : allDepts) {
-            List<Long> deptUserIds = sysUserService.selectUserByDeptId(dept.getDeptId()).stream()
-                    .map(SysUser::getUserId)
-                    .collect(Collectors.toList());
-            userIds.addAll(deptUserIds);
-        }
-
-        return userIds.stream().distinct().collect(Collectors.toList());
+        List<SysUser> sysUserList = sysUserService.selectUserByDeptId(deptId);
+        return sysUserList.stream()
+                .map(SysUser::getUserId)
+                .collect(Collectors.toList());
     }
 
-
 }

airport-admin/src/main/java/com/sundot/airport/web/controller/quality/SimpleAttendancePersonController.java

@@ -45,19 +45,25 @@ public class SimpleAttendancePersonController {
 
     /**
      * 出勤人次分析
+     * 支持按大队ID、科室ID、班组ID、用户ID 进行统计
      */
     @ApiOperation("出勤人次分析")
     @PostMapping("/calculate")
     public List<AttendancePersonStatsDTO> calculateStatistics(@RequestBody IndicatorCalculationParams params) {
         List<AttendancePersonStatsDTO> results = new ArrayList<>();
 
-        // 获取当前用户所在站点ID
-        Long topSiteId = DeptUtils.getTopSiteId(deptService.selectDeptById(getDeptId()));
-        List<SysDept> brigadesUnderSite = getBrigadesUnderSite(topSiteId);
-        brigadesUnderSite.add(deptService.selectDeptById(topSiteId));
-        brigadesUnderSite.forEach(dept -> {
-            results.add(createAttendancePersonStats(dept, params));
-        });
+        if (params.getDeptId() != null || params.getUserId() != null) {
+            // 传入了部门 ID 或用户 ID，直接统计
+            results.add(createAttendancePersonStatsForParams(params));
+        } else {
+            // 未传入具体 ID，默认获取当前用户所在站点下的科室
+            Long topSiteId = DeptUtils.getTopSiteId(deptService.selectDeptById(getDeptId()));
+            List<SysDept> brigadeUnderSite = getBrigadesUnderSite(topSiteId);
+            brigadeUnderSite.add(deptService.selectDeptById(topSiteId));
+            brigadeUnderSite.forEach(dept -> {
+                results.add(createAttendancePersonStats(dept, params));
+            });
+        }
 
         return results;
     }
@@ -73,6 +79,13 @@ public class SimpleAttendancePersonController {
     @ApiOperation("出勤人次趋势数据")
     @PostMapping("/trend-data")
     public List<AttendanceTrendDataDTO> getTrendData(@RequestBody IndicatorCalculationParams params) {
+        // 根据传入参数决定统计策略
+        if (params.getDeptId() != null || params.getUserId() != null) {
+            // 传入了部门 ID 或用户 ID，返回简化版的趋势数据
+            return getSimpleTrendData(params);
+        }
+
+        // 默认按站点 + 三科模式统计
         List<AttendanceTrendDataDTO> results = new ArrayList<>();
 
         // 根据时间维度类型决定展示策略
@@ -94,6 +107,112 @@ public class SimpleAttendancePersonController {
     }
 
     /**
+     * 趋势数据（用于指定部门/个人的场景）
+     * 仅返回单条数据序列
+     */
+    private List<AttendanceTrendDataDTO> getSimpleTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 根据时间维度类型决定展示策略
+        if (params.getMonth() != null) {
+            // 月度：展示当前月、上月、去年同期
+            results.addAll(generateSimpleMonthlyTrendData(params));
+        } else if (params.getQuarter() != null) {
+            // 季度：展示当前季度和去年同期
+            results.addAll(generateSimpleQuarterlyTrendData(params));
+        } else if (params.getYear() != null) {
+            // 年度：仅展示当前年和去年
+            results.addAll(generateSimpleYearlyTrendData(params));
+        } else {
+            // 默认按月度处理
+            results.addAll(generateSimpleMonthlyTrendData(params));
+        }
+
+        return results;
+    }
+
+    /**
+     * 月度趋势数据
+     */
+    private List<AttendanceTrendDataDTO> generateSimpleMonthlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 计算当前月数据
+        AttendancePersonStatsDTO currentData = createAttendancePersonStatsForParams(params);
+
+        // 计算上月数据
+        IndicatorCalculationParams lastMonthParams = createLastMonthParams(params);
+        AttendancePersonStatsDTO lastMonthData = createAttendancePersonStatsForParams(lastMonthParams);
+
+        // 计算去年同期数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        AttendancePersonStatsDTO lastYearData = createAttendancePersonStatsForParams(lastYearParams);
+
+        // 构造趋势数据点
+        results.add(createSimpleTrendDataPoint(getLastYearMonthLabel(params), lastYearData));
+        results.add(createSimpleTrendDataPoint(getLastMonthLabel(params), lastMonthData));
+        results.add(createSimpleTrendDataPoint(getMonthLabel(params), currentData));
+
+        return results;
+    }
+
+    /**
+     * 季度趋势数据
+     */
+    private List<AttendanceTrendDataDTO> generateSimpleQuarterlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 计算当前季度数据
+        AttendancePersonStatsDTO currentData = createAttendancePersonStatsForParams(params);
+
+        // 计算上季度数据
+        IndicatorCalculationParams lastQuarterParams = createLastQuarterParams(params);
+        AttendancePersonStatsDTO lastQuarterData = createAttendancePersonStatsForParams(lastQuarterParams);
+
+        // 计算去年同期季度数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        AttendancePersonStatsDTO lastYearData = createAttendancePersonStatsForParams(lastYearParams);
+
+        // 构造趋势数据点
+        results.add(createSimpleTrendDataPoint(getLastYearQuarterLabel(params), lastYearData));
+        results.add(createSimpleTrendDataPoint(getLastQuarterLabel(params), lastQuarterData));
+        results.add(createSimpleTrendDataPoint(getQuarterLabel(params), currentData));
+
+        return results;
+    }
+
+    /**
+     * 年度趋势数据
+     */
+    private List<AttendanceTrendDataDTO> generateSimpleYearlyTrendData(IndicatorCalculationParams params) {
+        List<AttendanceTrendDataDTO> results = new ArrayList<>();
+
+        // 计算当前年数据
+        AttendancePersonStatsDTO currentData = createAttendancePersonStatsForParams(params);
+
+        // 计算去年数据
+        IndicatorCalculationParams lastYearParams = createLastYearParams(params);
+        AttendancePersonStatsDTO lastYearData = createAttendancePersonStatsForParams(lastYearParams);
+
+        // 构造趋势数据点
+        results.add(createSimpleTrendDataPoint((params.getYear() - 1) + "年", lastYearData));
+        results.add(createSimpleTrendDataPoint(params.getYear() + "年", currentData));
+
+        return results;
+    }
+
+    /**
+     * 趋势数据点
+     */
+    private AttendanceTrendDataDTO createSimpleTrendDataPoint(String timeLabel, AttendancePersonStatsDTO stats) {
+        AttendanceTrendDataDTO data = new AttendanceTrendDataDTO();
+        data.setTimeLabel(timeLabel);
+        // 将单个统计值设置为 overall 字段
+        data.setOverall(stats.getCurrentValue() != null ? stats.getCurrentValue() : BigDecimal.ZERO);
+        return data;
+    }
+
+    /**
      * 生成月度趋势数据（同比+环比）
      * 展示：当前月、上月、去年同期
      */
@@ -288,7 +407,7 @@ public class SimpleAttendancePersonController {
 
 
     /**
-     * 创建出勤人次统计对象
+     * 创建出勤人次统计对象（根据部门实体）
      */
     private AttendancePersonStatsDTO createAttendancePersonStats(SysDept sysDept, IndicatorCalculationParams params) {
         AttendancePersonStatsDTO result = new AttendancePersonStatsDTO();
@@ -344,6 +463,56 @@ public class SimpleAttendancePersonController {
     }
 
     /**
+     * 创建出勤人次统计对象（根据参数直接计算）
+     * 支持按部门、班组、个人进行统计
+     */
+    private AttendancePersonStatsDTO createAttendancePersonStatsForParams(IndicatorCalculationParams params) {
+        AttendancePersonStatsDTO result = new AttendancePersonStatsDTO();
+
+        // 设置部门信息
+        if (params.getDeptId() != null) {
+            SysDept dept = deptService.selectDeptById(params.getDeptId());
+            if (dept != null) {
+                result.setDeptId(dept.getDeptId());
+                result.setDeptName(dept.getDeptName());
+                result.setDeptType(dept.getDeptType());
+            }
+        }
+
+        try {
+            IndicatorCalculationResult currentResult = multiModelIndicatorCalculator.calculateWithRatio(deptCalculator, params);
+
+            if ("SUCCESS".equals(currentResult.getStatus())) {
+                result.setCurrentValue(currentResult.getValue());
+                result.setBaselineValue(currentResult.getBaselineValue());
+
+                boolean showChainRatio = params.getChainRatio() != null && params.getChainRatio();
+                boolean showYearOnYear = params.getYearOnYear() != null && params.getYearOnYear();
+
+                if (params.getYear() != null && params.getQuarter() == null && params.getMonth() == null) {
+                    showChainRatio = false;
+                }
+
+                if (showYearOnYear && currentResult.getYearOnYearValue() != null) {
+                    result.setYearOnYearValue(currentResult.getYearOnYearValue());
+                    result.setYearOnYearDirection(getDirectionText(currentResult.getYearOnYearValue()));
+                    result.setYearOnYearTimeDimension((TimeDimensionParams) currentResult.getExtraInfo().get("yearOnYear"));
+                }
+
+                if (showChainRatio && currentResult.getChainRatioValue() != null) {
+                    result.setChainRatioValue(currentResult.getChainRatioValue());
+                    result.setChainRatioDirection(getDirectionText(currentResult.getChainRatioValue()));
+                    result.setChainTimeDimension((TimeDimensionParams) currentResult.getExtraInfo().get("chain"));
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        return result;
+    }
+
+    /**
      * 创建上月参数
      */
     private IndicatorCalculationParams createLastMonthParams(IndicatorCalculationParams originalParams) {
@@ -353,6 +522,8 @@ public class SimpleAttendancePersonController {
         params.setMonth(originalParams.getMonth());
         params.setStartTime(originalParams.getStartTime());
         params.setEndTime(originalParams.getEndTime());
+        params.setUserId(originalParams.getUserId());
+        params.setDeptId(originalParams.getDeptId());
         params.setChainRatio(false);
         params.setYearOnYear(false);
 
@@ -381,6 +552,8 @@ public class SimpleAttendancePersonController {
         params.setMonth(originalParams.getMonth());
         params.setStartTime(originalParams.getStartTime());
         params.setEndTime(originalParams.getEndTime());
+        params.setUserId(originalParams.getUserId());
+        params.setDeptId(originalParams.getDeptId());
         params.setChainRatio(false);
         params.setYearOnYear(false);
 
@@ -410,6 +583,8 @@ public class SimpleAttendancePersonController {
         params.setMonth(originalParams.getMonth());
         params.setStartTime(originalParams.getStartTime());
         params.setEndTime(originalParams.getEndTime());
+        params.setUserId(originalParams.getUserId());
+        params.setDeptId(originalParams.getDeptId());
         params.setChainRatio(false);
         params.setYearOnYear(false);
 

airport-attendance/src/main/java/com/sundot/airport/attendance/calculator/AttendancePersonCountCalculator.java

@@ -38,11 +38,8 @@ public class AttendancePersonCountCalculator extends AbstractIndicatorCalculator
         // 查询考勤记录
         List<AttendanceRecord> records = attendanceRecordMapper.selectAttendanceRecordList(record);
 
-        // 返回出勤人次（去重后的用户数量）
-        return new BigDecimal(records.stream()
-                .map(AttendanceRecord::getUserId)
-                .distinct()
-                .count());
+        // 返回出勤人次
+        return new BigDecimal(records.size());
     }
 
     @Override

airport-attendance/src/main/java/com/sundot/airport/attendance/calculator/BrigadeAttendancePersonCountCalculator.java

@@ -2,10 +2,13 @@ package com.sundot.airport.attendance.calculator;
 
 import com.sundot.airport.attendance.domain.AttendanceRecord;
 import com.sundot.airport.attendance.mapper.AttendanceRecordMapper;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.enums.IndicatorTypeEnum;
 import com.sundot.airport.common.statistics.AbstractIndicatorCalculator;
 import com.sundot.airport.common.statistics.IndicatorCalculationParams;
 import com.sundot.airport.common.statistics.TimeDimensionProcessor;
+import com.sundot.airport.system.mapper.SysDeptMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -25,6 +28,9 @@ public class BrigadeAttendancePersonCountCalculator extends AbstractIndicatorCal
     @Autowired
     private TimeDimensionProcessor timeDimensionProcessor;
 
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
     @Override
     public BigDecimal calculate(IndicatorCalculationParams params) {
 
@@ -32,31 +38,42 @@ public class BrigadeAttendancePersonCountCalculator extends AbstractIndicatorCal
 
         // 查询指定大队的出勤记录
         AttendanceRecord record = new AttendanceRecord();
-        if (params.getDeptId() != null) {
-            // 根据大队ID查询
-            record.setBrigadeCode(params.getDeptId().toString());
-        }
         record.setAttendanceDateStart(params.getStartTime());
         record.setAttendanceDateEnd(params.getEndTime());
 
+        // 根据传入参数决定查询维度：用户 ID > 部门 ID
+        if (params.getUserId() != null) {
+            // 按个人统计
+            record.setUserId(params.getUserId());
+        } else if (params.getDeptId() != null) {
+            // 按部门统计（大队、科室、班组等）
+            SysDept sysDept = sysDeptMapper.selectDeptById(params.getDeptId());
+            if (DeptTypeEnum.TEAMS.getCode().equals(sysDept.getDeptType())) {
+                record.setTeamCode(params.getDeptId().toString());
+            } else if (DeptTypeEnum.MANAGER.getCode().equals(sysDept.getDeptType())) {
+                record.setDepartmentCode(params.getDeptId().toString());
+            } else if (DeptTypeEnum.BRIGADE.getCode().equals(sysDept.getDeptType())) {
+                record.setBrigadeCode(params.getDeptId().toString());
+            } else if (DeptTypeEnum.STATION.getCode().equals(sysDept.getDeptType())) {
+                record.setStationCode(params.getDeptId().toString());
+            }
+        }
+
         // 查询考勤记录
         List<AttendanceRecord> records = attendanceRecordMapper.selectAttendanceRecordList(record);
 
-        // 返回大队出勤人次（去重后的用户数量）
-        return new BigDecimal(records.stream()
-                .map(AttendanceRecord::getUserId)
-                .distinct()
-                .count());
+        // 返回出勤人次
+        return new BigDecimal(records.size());
     }
 
     @Override
     public String getIndicatorType() {
-        return IndicatorTypeEnum.DEPARTMENT_ATTENDANCE_PERSONS.getCode();
+        return IndicatorTypeEnum.BRIGADE_ATTENDANCE_PERSONS.getCode();
     }
 
     @Override
     public String getIndicatorName() {
-        return IndicatorTypeEnum.DEPARTMENT_ATTENDANCE_PERSONS.getName();
+        return IndicatorTypeEnum.BRIGADE_ATTENDANCE_PERSONS.getName();
     }
 
     @Override

airport-common/src/main/java/com/sundot/airport/common/enums/IndicatorTypeEnum.java

@@ -11,7 +11,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum IndicatorTypeEnum {
     ATTENDANCE_PERSONS("attendance_persons", "出勤人次"),
-    DEPARTMENT_ATTENDANCE_PERSONS("department_attendance_persons", "科室出勤人次"),
+    BRIGADE_ATTENDANCE_PERSONS("brigade_attendance_persons", "大队出勤人次"),
     ;
 
     /**

airport-common/src/main/java/com/sundot/airport/common/statistics/TimeDimensionParams.java

@@ -65,4 +65,29 @@ public class TimeDimensionParams {
      */
     @ApiModelProperty(value = "对比周期数")
     private Integer comparePeriods = 1;
+
+    /**
+     * 大队 ID
+     */
+    @ApiModelProperty(value = "大队 ID")
+    private Long brigadeId;
+
+    /**
+     * 科室 ID
+     */
+    @ApiModelProperty(value = "科室 ID")
+    private Long departmentId;
+
+    /**
+     * 班 ID
+     */
+    @ApiModelProperty(value = "班 ID")
+    private Long teamId;
+
+    /**
+     * 人员 ID
+     */
+    @ApiModelProperty(value = "人员 ID")
+    private Long userId;
+
 }

airport-item/src/main/java/com/sundot/airport/item/domain/dto/QualificationLevelStatsDTO.java

@@ -1,5 +1,6 @@
 package com.sundot.airport.item.domain.dto;
 
+import com.sundot.airport.system.domain.SysPost;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -109,22 +110,34 @@ public class QualificationLevelStatsDTO implements Serializable {
         private static final long serialVersionUID = 1L;
 
         /**
-         * 大队ID
+         * 大队ID/用户ID
          */
-        @ApiModelProperty("大队ID")
+        @ApiModelProperty("大队ID/用户ID")
         private Long deptId;
 
         /**
-         * 大队名称
+         * 大队名称/用户姓名
          */
-        @ApiModelProperty("大队名称")
+        @ApiModelProperty("大队名称/用户姓名")
         private String deptName;
 
         /**
-         * 各等级人数数据
+         * 资质等级（个人查询时返回）
+         */
+        @ApiModelProperty("资质等级")
+        private String qualificationLevel;
+
+        /**
+         * 各等级人数数据（部门统计时返回）
          */
         @ApiModelProperty("各等级人数数据")
         private List<LevelCount> levelCounts;
+
+        /**
+         * 可上岗岗位
+         */
+        @ApiModelProperty("可上岗岗位")
+        private List<SysPost> sysPostList;
     }
 
     /**

airport-item/src/main/java/com/sundot/airport/item/domain/home/SeizureReportDTO.java

@@ -76,4 +76,17 @@ public class SeizureReportDTO {
         private Integer rank;
     }
 
+    // 用于表示用户排名项的内部类
+    @Data
+    public static class UserRankingItem {
+        @ApiModelProperty("用户姓名")
+        private String userName;
+        @ApiModelProperty("查获数量")
+        private BigDecimal seizureCount;
+        @ApiModelProperty("当前排名")
+        private Integer currentRank;
+        @ApiModelProperty("当前占比")
+        private BigDecimal currentRatio;
+    }
+
 }

airport-item/src/main/java/com/sundot/airport/item/mapper/ItemCategoryStatsMapper.java

@@ -17,93 +17,149 @@ public interface ItemCategoryStatsMapper {
     /**
      * 按一级分类统计全站查获数据
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 分类统计数据列表
      */
     List<ItemCategoryStatsDTO.CategoryStat> selectStationCategoryStats(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
     /**
      * 统计全站查获总量
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 总查获数量
      */
     Long selectStationTotalQuantity(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
     /**
      * 按部位统计隐匿夹带查获数据
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 部位统计数据列表
      */
     List<ItemCategoryStatsDTO.CategoryStat> selectStationConcealmentPositionStats(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
     /**
      * 统计全站隐匿夹带查获总量
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 隐匿夹带总查获数量
      */
     Long selectStationConcealmentTotalQuantity(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
     /**
      * 按岗位第二级分类统计查获数据
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 岗位分类统计数据列表
      */
     List<ItemCategoryStatsDTO.CategoryStat> selectStationPostCategoryStats(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
     /**
      * 统计全站岗位分类查获总量
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 岗位分类总查获数量
      */
     Long selectStationPostCategoryTotalQuantity(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
     /**
      * 查询全站通道排名前五数据
      *
-     * @param stationId 站点ID
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param stationId    站点ID
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param brigadeId    大队 ID（可选）
+     * @param departmentId 科室 ID（可选）
+     * @param teamId       班 ID（可选）
+     * @param userId       人员 ID（可选）
      * @return 通道排名数据列表（前五名）
      */
     List<ChannelRankingStatsDTO.ChannelRankingItem> selectTopFiveChannelRankings(
             @Param("stationId") Long stationId,
             @Param("startTime") Date startTime,
-            @Param("endTime") Date endTime);
+            @Param("endTime") Date endTime,
+            @Param("brigadeId") Long brigadeId,
+            @Param("departmentId") Long departmentId,
+            @Param("teamId") Long teamId,
+            @Param("userId") Long userId);
 
 
 }

airport-item/src/main/java/com/sundot/airport/item/mapper/SeizureReportMapper.java

@@ -163,6 +163,35 @@ public interface SeizureReportMapper {
      */
     public List<SeizureReportDTO.BrigadeRankingItem> selectBrigadeRankings(@Param("deptId") Long deptId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 
+    /**
+     * 查询科室排名（根据大队 ID）
+     *
+     * @param brigadeId 大队 ID
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 班组排名列表
+     */
+    public List<SeizureReportDTO.DepartmentRankingItem> selectDepartmentRankingsByBrigadeId(@Param("brigadeId") Long brigadeId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 查询班组排名（根据科室 ID）
+     *
+     * @param departmentId 科室 ID
+     * @param startDate    开始日期
+     * @param endDate      结束日期
+     * @return 班组排名列表
+     */
+    public List<SeizureReportDTO.TeamRankingItem> selectTeamRankingsByDepartmentId(@Param("departmentId") Long departmentId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 查询用户排名（根据班组 ID）
+     *
+     * @param teamId    班组 ID
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 用户排名列表
+     */
+    public List<SeizureReportDTO.UserRankingItem> selectUserRankingsByTeamId(@Param("teamId") Long teamId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 
     /**
      * 查询排名前三的班组（不包含排名，排名在Java代码中计算）

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemCategoryStatsServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,13 +46,21 @@ public class ItemCategoryStatsServiceImpl implements IItemCategoryStatsService {
                 itemCategoryStatsMapper.selectStationCategoryStats(
                         stationId,
                         timeParams.getStartTime(),
-                        timeParams.getEndTime());
+                        timeParams.getEndTime(),
+                        params.getBrigadeId(),
+                        params.getDepartmentId(),
+                        params.getTeamId(),
+                        params.getUserId());
 
         // 查询总数量
         Long totalQuantity = itemCategoryStatsMapper.selectStationTotalQuantity(
                 stationId,
                 timeParams.getStartTime(),
-                timeParams.getEndTime());
+                timeParams.getEndTime(),
+                params.getBrigadeId(),
+                params.getDepartmentId(),
+                params.getTeamId(),
+                params.getUserId());
 
 
         result.setCategoryStats(categoryStats);
@@ -74,13 +83,21 @@ public class ItemCategoryStatsServiceImpl implements IItemCategoryStatsService {
                 itemCategoryStatsMapper.selectStationConcealmentPositionStats(
                         stationId,
                         timeParams.getStartTime(),
-                        timeParams.getEndTime());
+                        timeParams.getEndTime(),
+                        params.getBrigadeId(),
+                        params.getDepartmentId(),
+                        params.getTeamId(),
+                        params.getUserId());
 
         // 查询隐匿夹带总数量
         Long totalQuantity = itemCategoryStatsMapper.selectStationConcealmentTotalQuantity(
                 stationId,
                 timeParams.getStartTime(),
-                timeParams.getEndTime());
+                timeParams.getEndTime(),
+                params.getBrigadeId(),
+                params.getDepartmentId(),
+                params.getTeamId(),
+                params.getUserId());
 
         // 转换为部位统计格式并计算占比
         List<ConcealmentPositionStatsDTO.PositionStat> convertedStats = positionStats.stream()
@@ -140,13 +157,21 @@ public class ItemCategoryStatsServiceImpl implements IItemCategoryStatsService {
                 itemCategoryStatsMapper.selectStationPostCategoryStats(
                         stationId,
                         timeParams.getStartTime(),
-                        timeParams.getEndTime());
+                        timeParams.getEndTime(),
+                        params.getBrigadeId(),
+                        params.getDepartmentId(),
+                        params.getTeamId(),
+                        params.getUserId());
 
         // 查询岗位分类总数量
         Long totalQuantity = itemCategoryStatsMapper.selectStationPostCategoryTotalQuantity(
                 stationId,
                 timeParams.getStartTime(),
-                timeParams.getEndTime());
+                timeParams.getEndTime(),
+                params.getBrigadeId(),
+                params.getDepartmentId(),
+                params.getTeamId(),
+                params.getUserId());
 
         // 转换为岗位统计格式并计算占比
         List<PostCategoryStatsDTO.PostStat> convertedStats = postStats.stream()
@@ -190,7 +215,11 @@ public class ItemCategoryStatsServiceImpl implements IItemCategoryStatsService {
                 itemCategoryStatsMapper.selectTopFiveChannelRankings(
                         stationId,
                         timeParams.getStartTime(),
-                        timeParams.getEndTime());
+                        timeParams.getEndTime(),
+                        params.getBrigadeId(),
+                        params.getDepartmentId(),
+                        params.getTeamId(),
+                        params.getUserId());
 
         // 转换数据类型并设置查获数量
         List<ChannelRankingStatsDTO.ChannelRankingItem> convertedStats = channelRankings.stream()
@@ -213,15 +242,135 @@ public class ItemCategoryStatsServiceImpl implements IItemCategoryStatsService {
     public List<SeizureReportDTO.BrigadeRankingItem> getBrigadeRanking(Long topSiteId, TimeDimensionParams params) {
         // 计算时间范围
         TimeDimensionParams timeParams = timeDimensionProcessor.calculateTimeRange(params);
-        List<SeizureReportDTO.BrigadeRankingItem> brigadeRankings = seizureReportMapper.selectBrigadeRankings(topSiteId, timeParams.getStartTime(), timeParams.getEndTime());
-        //计算总查获数量
-        BigDecimal totalSeizureQuantity = brigadeRankings.stream().map(item -> item.getSeizureCount()).reduce(BigDecimal.ZERO, BigDecimal::add);
-        //计算排名和占比
-        brigadeRankings.forEach(item -> {
-            item.setCurrentRank(brigadeRankings.indexOf(item) + 1);
-            item.setCurrentRatio(totalSeizureQuantity.compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ZERO : item.getSeizureCount().divide(totalSeizureQuantity, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
-        });
-        return brigadeRankings;
+
+        // 根据参数判断返回不同维度的排名
+        if (params.getTeamId() != null) {
+            // 传入班 ID，返回用户排名和占比
+            List<SeizureReportDTO.UserRankingItem> userRankings = seizureReportMapper.selectUserRankingsByTeamId(
+                    params.getTeamId(),
+                    timeParams.getStartTime(),
+                    timeParams.getEndTime());
+
+            // 计算总查获数量
+            BigDecimal totalSeizureQuantity = userRankings.stream()
+                    .map(SeizureReportDTO.UserRankingItem::getSeizureCount)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 计算排名和占比
+            return convertUserRankingsToBrigadeRankings(userRankings, totalSeizureQuantity);
+        } else if (params.getDepartmentId() != null) {
+            // 传入科室 ID，返回班组排名和占比
+            List<SeizureReportDTO.TeamRankingItem> teamRankings = seizureReportMapper.selectTeamRankingsByDepartmentId(
+                    params.getDepartmentId(),
+                    timeParams.getStartTime(),
+                    timeParams.getEndTime());
+
+            // 计算总查获数量
+            BigDecimal totalSeizureQuantity = teamRankings.stream()
+                    .map(SeizureReportDTO.TeamRankingItem::getSeizureCount)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 计算排名和占比
+            return convertTeamRankingsToBrigadeRankings(teamRankings, totalSeizureQuantity);
+        } else if (params.getBrigadeId() != null) {
+            // 传入大队 ID，返回科室排名和占比
+            List<SeizureReportDTO.DepartmentRankingItem> departmentRankings = seizureReportMapper.selectDepartmentRankingsByBrigadeId(
+                    params.getBrigadeId(),
+                    timeParams.getStartTime(),
+                    timeParams.getEndTime());
+
+            // 计算总查获数量
+            BigDecimal totalSeizureQuantity = departmentRankings.stream()
+                    .map(SeizureReportDTO.DepartmentRankingItem::getSeizureCount)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 计算排名和占比
+            return convertDepartmentRankingsToBrigadeRankings(departmentRankings, totalSeizureQuantity);
+        } else {
+            // 返回大队排名和占比
+            List<SeizureReportDTO.BrigadeRankingItem> brigadeRankings = seizureReportMapper.selectBrigadeRankings(
+                    topSiteId,
+                    timeParams.getStartTime(),
+                    timeParams.getEndTime());
+
+            // 计算总查获数量
+            BigDecimal totalSeizureQuantity = brigadeRankings.stream()
+                    .map(item -> item.getSeizureCount())
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            // 计算排名和占比
+            for (int i = 0; i < brigadeRankings.size(); i++) {
+                SeizureReportDTO.BrigadeRankingItem item = brigadeRankings.get(i);
+                item.setCurrentRank(i + 1);
+                item.setCurrentRatio(totalSeizureQuantity.compareTo(BigDecimal.ZERO) == 0 ?
+                        BigDecimal.ZERO :
+                        item.getSeizureCount().divide(totalSeizureQuantity, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
+            }
+            return brigadeRankings;
+        }
+    }
+
+    /**
+     * 将用户排名列表转换为大队排名列表格式
+     */
+    private List<SeizureReportDTO.BrigadeRankingItem> convertUserRankingsToBrigadeRankings(
+            List<SeizureReportDTO.UserRankingItem> userRankings, BigDecimal totalSeizureQuantity) {
+
+        List<SeizureReportDTO.BrigadeRankingItem> result = new ArrayList<>();
+        for (int i = 0; i < userRankings.size(); i++) {
+            SeizureReportDTO.UserRankingItem userItem = userRankings.get(i);
+            SeizureReportDTO.BrigadeRankingItem deptItem = new SeizureReportDTO.BrigadeRankingItem();
+            deptItem.setBrigadeName(userItem.getUserName());
+            deptItem.setSeizureCount(userItem.getSeizureCount());
+            deptItem.setCurrentRank(i + 1);
+            deptItem.setCurrentRatio(totalSeizureQuantity.compareTo(BigDecimal.ZERO) == 0 ?
+                    BigDecimal.ZERO :
+                    userItem.getSeizureCount().divide(totalSeizureQuantity, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
+            result.add(deptItem);
+        }
+        return result;
+    }
+
+    /**
+     * 将班组排名列表转换为大队排名列表格式
+     */
+    private List<SeizureReportDTO.BrigadeRankingItem> convertTeamRankingsToBrigadeRankings(
+            List<SeizureReportDTO.TeamRankingItem> teamRankings, BigDecimal totalSeizureQuantity) {
+
+        List<SeizureReportDTO.BrigadeRankingItem> result = new ArrayList<>();
+        for (int i = 0; i < teamRankings.size(); i++) {
+            SeizureReportDTO.TeamRankingItem teamItem = teamRankings.get(i);
+            SeizureReportDTO.BrigadeRankingItem deptItem = new SeizureReportDTO.BrigadeRankingItem();
+            deptItem.setBrigadeName(teamItem.getTeamName());
+            deptItem.setSeizureCount(teamItem.getSeizureCount());
+            deptItem.setCurrentRank(i + 1);
+            deptItem.setCurrentRatio(totalSeizureQuantity.compareTo(BigDecimal.ZERO) == 0 ?
+                    BigDecimal.ZERO :
+                    teamItem.getSeizureCount().divide(totalSeizureQuantity, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
+            result.add(deptItem);
+        }
+        return result;
+    }
+
+    /**
+     * 将科室排名列表转换为大队排名列表格式
+     */
+    private List<SeizureReportDTO.BrigadeRankingItem> convertDepartmentRankingsToBrigadeRankings(
+            List<SeizureReportDTO.DepartmentRankingItem> departmentRankings, BigDecimal totalSeizureQuantity) {
+
+        List<SeizureReportDTO.BrigadeRankingItem> result = new ArrayList<>();
+        for (int i = 0; i < departmentRankings.size(); i++) {
+            SeizureReportDTO.DepartmentRankingItem teamItem = departmentRankings.get(i);
+            SeizureReportDTO.BrigadeRankingItem deptItem = new SeizureReportDTO.BrigadeRankingItem();
+            deptItem.setBrigadeName(teamItem.getDepartmentName());
+            deptItem.setSeizureCount(teamItem.getSeizureCount());
+            deptItem.setCurrentRank(i + 1);
+            deptItem.setCurrentRatio(totalSeizureQuantity.compareTo(BigDecimal.ZERO) == 0 ?
+                    BigDecimal.ZERO :
+                    teamItem.getSeizureCount().divide(totalSeizureQuantity, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
+            result.add(deptItem);
+        }
+        return result;
     }
 
     /**

airport-item/src/main/java/com/sundot/airport/item/service/impl/ItemLargeScreenServiceImpl.java

@@ -8,6 +8,7 @@ import com.sundot.airport.common.core.domain.GroupedBoxPlotDataDto;
 import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
 import com.sundot.airport.common.core.domain.SysUsageReportDto;
 import com.sundot.airport.common.core.domain.SysUsageReportSeizureDto;
+import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.dto.BaseCommonDto;
 import com.sundot.airport.item.domain.*;
@@ -15,6 +16,7 @@ import com.sundot.airport.item.mapper.ItemLargeScreenMapper;
 import com.sundot.airport.item.mapper.SeizureReportMapper;
 import com.sundot.airport.item.service.ItemLargeScreenService;
 import com.sundot.airport.item.service.SeizureDistributionService;
+import com.sundot.airport.system.service.ISysDeptService;
 import com.sundot.airport.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +46,8 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
     private SeizureDistributionService seizureDistributionService;
     @Autowired
     private SeizureReportMapper seizureReportMapper;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 移交公安情况
@@ -365,21 +369,51 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
                 .filter(java.util.Objects::nonNull)
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-        // 3. 按大队分组统计
-        Map<String, List<ItemLargeScreenInfoDto>> groupedByBrigade = policeList.stream()
+        // 3. 根据参数判断分组和排序维度
+        List<ItemLargeScreenBrigadeRankDto> brigadeRankList;
+
+        if (dto.getUserId() != null) {
+            brigadeRankList = new ArrayList<>();
+        } else if (dto.getInspectTeamId() != null) {
+            // 传入了班 ID，按个人分组统计
+            brigadeRankList = groupAndRankByUser(policeList, totalQuantity);
+        } else if (dto.getInspectDepartmentId() != null) {
+            // 传入了科室 ID，按班组分组统计
+            brigadeRankList = groupAndRankByTeam(policeList, totalQuantity);
+        } else if (dto.getInspectBrigadeId() != null) {
+            // 默认（站级别），按科室分组统计
+            brigadeRankList = groupAndRankByDepartment(policeList, totalQuantity);
+        } else {
+            brigadeRankList = groupAndRankByBrigade(policeList, totalQuantity);
+        }
+
+        // 4. 构造返回结果
+        ItemLargeScreenPoliceStatsDto result = new ItemLargeScreenPoliceStatsDto();
+        result.setTotalQuantity(totalQuantity);
+        result.setBrigadeRankList(brigadeRankList);
+
+        return result;
+    }
+
+    /**
+     * 按大队分组统计并排序（站级别使用）
+     */
+    private List<ItemLargeScreenBrigadeRankDto> groupAndRankByBrigade(List<ItemLargeScreenInfoDto> dataList, BigDecimal totalQuantity) {
+        // 按科室分组
+        Map<String, List<ItemLargeScreenInfoDto>> groupedByBrigade = dataList.stream()
                 .collect(Collectors.groupingBy(item ->
                         item.getInspectBrigadeId() + "###" + item.getInspectBrigadeName()));
 
-        // 4. 转换为大队排名列表
-        List<ItemLargeScreenBrigadeRankDto> brigadeRankList = groupedByBrigade.entrySet().stream()
+        // 转换为科室排名列表
+        List<ItemLargeScreenBrigadeRankDto> rankList = groupedByBrigade.entrySet().stream()
                 .map(entry -> {
                     ItemLargeScreenBrigadeRankDto rankDto = new ItemLargeScreenBrigadeRankDto();
                     List<ItemLargeScreenInfoDto> items = entry.getValue();
 
                     if (!items.isEmpty()) {
                         ItemLargeScreenInfoDto firstItem = items.get(0);
-                        rankDto.setBrigadeId(firstItem.getInspectBrigadeId());
-                        rankDto.setBrigadeName(firstItem.getInspectBrigadeName());
+                        rankDto.setBrigadeId(firstItem.getInspectDepartmentId());
+                        rankDto.setBrigadeName(firstItem.getInspectDepartmentName());
 
                         // 计算该科室的查获总数量
                         BigDecimal deptQuantity = items.stream()
@@ -402,17 +436,159 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
                 .sorted(Comparator.comparing(ItemLargeScreenBrigadeRankDto::getQuantity).reversed())
                 .collect(Collectors.toList());
 
-        // 5. 设置排名
-        for (int i = 0; i < brigadeRankList.size(); i++) {
-            brigadeRankList.get(i).setRank(i + 1);
+        // 设置排名
+        for (int i = 0; i < rankList.size(); i++) {
+            rankList.get(i).setRank(i + 1);
         }
 
-        // 6. 构造返回结果
-        ItemLargeScreenPoliceStatsDto result = new ItemLargeScreenPoliceStatsDto();
-        result.setTotalQuantity(totalQuantity);
-        result.setBrigadeRankList(brigadeRankList);
+        return rankList;
+    }
 
-        return result;
+    /**
+     * 按科室分组统计并排序（大队级别使用）
+     */
+    private List<ItemLargeScreenBrigadeRankDto> groupAndRankByDepartment(List<ItemLargeScreenInfoDto> dataList, BigDecimal totalQuantity) {
+        // 按科室分组
+        Map<String, List<ItemLargeScreenInfoDto>> groupedByDepartment = dataList.stream()
+                .collect(Collectors.groupingBy(item ->
+                        item.getInspectDepartmentId() + "###" + item.getInspectDepartmentName()));
+
+        // 转换为科室排名列表
+        List<ItemLargeScreenBrigadeRankDto> rankList = groupedByDepartment.entrySet().stream()
+                .map(entry -> {
+                    ItemLargeScreenBrigadeRankDto rankDto = new ItemLargeScreenBrigadeRankDto();
+                    List<ItemLargeScreenInfoDto> items = entry.getValue();
+
+                    if (!items.isEmpty()) {
+                        ItemLargeScreenInfoDto firstItem = items.get(0);
+                        rankDto.setBrigadeId(firstItem.getInspectDepartmentId());
+                        rankDto.setBrigadeName(firstItem.getInspectDepartmentName());
+
+                        // 计算该科室的查获总数量
+                        BigDecimal deptQuantity = items.stream()
+                                .map(ItemLargeScreenInfoDto::getQuantity)
+                                .filter(java.util.Objects::nonNull)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        rankDto.setQuantity(deptQuantity);
+
+                        // 计算占比
+                        if (totalQuantity.compareTo(BigDecimal.ZERO) > 0) {
+                            rankDto.setScale(deptQuantity.multiply(new BigDecimal("100"))
+                                    .divide(totalQuantity, 2, BigDecimal.ROUND_HALF_UP));
+                        } else {
+                            rankDto.setScale(BigDecimal.ZERO);
+                        }
+                    }
+
+                    return rankDto;
+                })
+                .sorted(Comparator.comparing(ItemLargeScreenBrigadeRankDto::getQuantity).reversed())
+                .collect(Collectors.toList());
+
+        // 设置排名
+        for (int i = 0; i < rankList.size(); i++) {
+            rankList.get(i).setRank(i + 1);
+        }
+
+        return rankList;
+    }
+
+    /**
+     * 按班组分组统计并排序
+     */
+    private List<ItemLargeScreenBrigadeRankDto> groupAndRankByTeam(List<ItemLargeScreenInfoDto> dataList, BigDecimal totalQuantity) {
+        // 按班组分组
+        Map<String, List<ItemLargeScreenInfoDto>> groupedByTeam = dataList.stream()
+                .collect(Collectors.groupingBy(item ->
+                        item.getInspectTeamId() + "###" + item.getInspectTeamName()));
+
+        // 转换为班组排名列表
+        List<ItemLargeScreenBrigadeRankDto> rankList = groupedByTeam.entrySet().stream()
+                .map(entry -> {
+                    ItemLargeScreenBrigadeRankDto rankDto = new ItemLargeScreenBrigadeRankDto();
+                    List<ItemLargeScreenInfoDto> items = entry.getValue();
+
+                    if (!items.isEmpty()) {
+                        ItemLargeScreenInfoDto firstItem = items.get(0);
+                        rankDto.setBrigadeId(firstItem.getInspectTeamId());
+                        rankDto.setBrigadeName(firstItem.getInspectTeamName());
+
+                        // 计算该班组的查获总数量
+                        BigDecimal teamQuantity = items.stream()
+                                .map(ItemLargeScreenInfoDto::getQuantity)
+                                .filter(java.util.Objects::nonNull)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        rankDto.setQuantity(teamQuantity);
+
+                        // 计算占比
+                        if (totalQuantity.compareTo(BigDecimal.ZERO) > 0) {
+                            rankDto.setScale(teamQuantity.multiply(new BigDecimal("100"))
+                                    .divide(totalQuantity, 2, BigDecimal.ROUND_HALF_UP));
+                        } else {
+                            rankDto.setScale(BigDecimal.ZERO);
+                        }
+                    }
+
+                    return rankDto;
+                })
+                .sorted(Comparator.comparing(ItemLargeScreenBrigadeRankDto::getQuantity).reversed())
+                .collect(Collectors.toList());
+
+        // 设置排名
+        for (int i = 0; i < rankList.size(); i++) {
+            rankList.get(i).setRank(i + 1);
+        }
+
+        return rankList;
+    }
+
+    /**
+     * 按个人分组统计并排序
+     */
+    private List<ItemLargeScreenBrigadeRankDto> groupAndRankByUser(List<ItemLargeScreenInfoDto> dataList, BigDecimal totalQuantity) {
+        // 按个人分组
+        Map<String, List<ItemLargeScreenInfoDto>> groupedByUser = dataList.stream()
+                .collect(Collectors.groupingBy(item ->
+                        item.getInspectUserId() + "###" + item.getInspectUserName()));
+
+        // 转换为个人排名列表
+        List<ItemLargeScreenBrigadeRankDto> rankList = groupedByUser.entrySet().stream()
+                .map(entry -> {
+                    ItemLargeScreenBrigadeRankDto rankDto = new ItemLargeScreenBrigadeRankDto();
+                    List<ItemLargeScreenInfoDto> items = entry.getValue();
+
+                    if (!items.isEmpty()) {
+                        ItemLargeScreenInfoDto firstItem = items.get(0);
+                        rankDto.setBrigadeId(firstItem.getInspectUserId());
+                        rankDto.setBrigadeName(firstItem.getInspectUserName());
+
+                        // 计算个人的查获总数量
+                        BigDecimal userQuantity = items.stream()
+                                .map(ItemLargeScreenInfoDto::getQuantity)
+                                .filter(java.util.Objects::nonNull)
+                                .reduce(BigDecimal.ZERO, BigDecimal::add);
+                        rankDto.setQuantity(userQuantity);
+
+                        // 计算占比
+                        if (totalQuantity.compareTo(BigDecimal.ZERO) > 0) {
+                            rankDto.setScale(userQuantity.multiply(new BigDecimal("100"))
+                                    .divide(totalQuantity, 2, BigDecimal.ROUND_HALF_UP));
+                        } else {
+                            rankDto.setScale(BigDecimal.ZERO);
+                        }
+                    }
+
+                    return rankDto;
+                })
+                .sorted(Comparator.comparing(ItemLargeScreenBrigadeRankDto::getQuantity).reversed())
+                .collect(Collectors.toList());
+
+        // 设置排名
+        for (int i = 0; i < rankList.size(); i++) {
+            rankList.get(i).setRank(i + 1);
+        }
+
+        return rankList;
     }
 
     /**
@@ -457,15 +633,48 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
         BigDecimal lowerBound = BigDecimal.ZERO;
         BigDecimal upperBound = BigDecimal.ZERO;
 
-        if (!boxPlotDataList.isEmpty()) {
-            BoxPlotDataDto boxPlotData = boxPlotDataList.get(0).getBoxPlotData();
-            lowerBound = boxPlotData.getLowerBound();
-            upperBound = boxPlotData.getUpperBound();
+        if (dto.getInspectBrigadeId() != null) {
+            // 根据 id 获取部门信息
+            SysDept dept = sysDeptService.selectDeptById(dto.getInspectBrigadeId());
+            if (Objects.isNull(dept)) {
+                return Collections.emptyList();
+            }
+
+            // 查找匹配的分组数据
+            Optional<GroupedBoxPlotDataDto> matchedGroup = boxPlotDataList.stream()
+                    .filter(grouped -> Objects.equals(grouped.getGroupName(), dept.getDeptName()))
+                    .findFirst();
+
+            if (matchedGroup.isPresent()) {
+                BoxPlotDataDto boxPlotData = matchedGroup.get().getBoxPlotData();
+                if (Objects.nonNull(boxPlotData)) {
+                    lowerBound = boxPlotData.getLowerBound();
+                    upperBound = boxPlotData.getUpperBound();
+                }
+            }
+        } else {
+            GroupedBoxPlotDataDto firstGroup = boxPlotDataList.get(0);
+            if (Objects.nonNull(firstGroup) && Objects.nonNull(firstGroup.getBoxPlotData())) {
+                BoxPlotDataDto boxPlotData = firstGroup.getBoxPlotData();
+                lowerBound = boxPlotData.getLowerBound();
+                upperBound = boxPlotData.getUpperBound();
+            }
         }
 
+
         // 3. 查询用户信息和查获数量
-        List<ItemLargeScreenHomePageSeizureReportSqlDto> seizureReportList = seizureReportMapper.homePageSeizureReport(dto);
-        List<LargeScreenHomePageUserInfoSqlDto> userInfoList = sysUserService.homePageUserInfo();
+        List<ItemLargeScreenHomePageSeizureReportSqlDto> seizureReportList;
+        List<LargeScreenHomePageUserInfoSqlDto> userInfoList;
+
+        if (dto.getInspectBrigadeId() != null) {
+            // 有大队 ID，查询大队数据
+            seizureReportList = seizureReportMapper.homePageSeizureReportBrigadeId(dto);
+            userInfoList = sysUserService.homePageUserInfoByBrigadeId(dto.getInspectBrigadeId());
+        } else {
+            // 无大队 ID，查询全站数据
+            seizureReportList = seizureReportMapper.homePageSeizureReport(dto);
+            userInfoList = sysUserService.homePageUserInfo();
+        }
 
         if (CollUtil.isEmpty(seizureReportList) || CollUtil.isEmpty(userInfoList)) {
             return Collections.emptyList();
@@ -519,15 +728,48 @@ public class ItemLargeScreenServiceImpl implements ItemLargeScreenService {
         BigDecimal lowerBound = BigDecimal.ZERO;
         BigDecimal upperBound = BigDecimal.ZERO;
 
-        if (!boxPlotDataList.isEmpty()) {
-            BoxPlotDataDto boxPlotData = boxPlotDataList.get(0).getBoxPlotData();
-            lowerBound = boxPlotData.getLowerBound();
-            upperBound = boxPlotData.getUpperBound();
+
+        if (dto.getInspectBrigadeId() != null) {
+            // 根据 id 获取部门信息
+            SysDept dept = sysDeptService.selectDeptById(dto.getInspectBrigadeId());
+            if (Objects.isNull(dept)) {
+                return result;
+            }
+
+            // 查找匹配的分组数据
+            Optional<GroupedBoxPlotDataDto> matchedGroup = boxPlotDataList.stream()
+                    .filter(grouped -> Objects.equals(grouped.getGroupName(), dept.getDeptName()))
+                    .findFirst();
+
+            if (matchedGroup.isPresent()) {
+                BoxPlotDataDto boxPlotData = matchedGroup.get().getBoxPlotData();
+                if (Objects.nonNull(boxPlotData)) {
+                    lowerBound = boxPlotData.getLowerBound();
+                    upperBound = boxPlotData.getUpperBound();
+                }
+            }
+        } else {
+            GroupedBoxPlotDataDto firstGroup = boxPlotDataList.get(0);
+            if (Objects.nonNull(firstGroup) && Objects.nonNull(firstGroup.getBoxPlotData())) {
+                BoxPlotDataDto boxPlotData = firstGroup.getBoxPlotData();
+                lowerBound = boxPlotData.getLowerBound();
+                upperBound = boxPlotData.getUpperBound();
+            }
         }
 
         // 3. 查询用户信息和查获数量
-        List<ItemLargeScreenHomePageSeizureReportSqlDto> seizureReportList = seizureReportMapper.homePageSeizureReport(dto);
-        List<LargeScreenHomePageUserInfoSqlDto> userInfoList = sysUserService.homePageUserInfo();
+        List<ItemLargeScreenHomePageSeizureReportSqlDto> seizureReportList;
+        List<LargeScreenHomePageUserInfoSqlDto> userInfoList;
+
+        if (dto.getInspectDepartmentId() != null) {
+            // 有大队 ID，查询大队数据
+            seizureReportList = seizureReportMapper.homePageSeizureReportBrigadeId(dto);
+            userInfoList = sysUserService.homePageUserInfoByBrigadeId(dto.getInspectBrigadeId());
+        } else {
+            // 无大队 ID，查询全站数据
+            seizureReportList = seizureReportMapper.homePageSeizureReport(dto);
+            userInfoList = sysUserService.homePageUserInfo();
+        }
 
         if (CollUtil.isEmpty(seizureReportList) || CollUtil.isEmpty(userInfoList)) {
             return result;

airport-item/src/main/resources/mapper/item/ItemCategoryStatsMapper.xml

@@ -8,16 +8,25 @@
     <select id="selectStationCategoryStats"
             resultType="com.sundot.airport.item.domain.dto.ItemCategoryStatsDTO$CategoryStat">
         SELECT isi.category_code_one AS categoryCodeOne,
-               isi.category_name_one AS categoryNameOne,
-               SUM(isi.quantity)     AS quantity
+        isi.category_name_one AS categoryNameOne,
+        SUM(isi.quantity) AS quantity
         FROM item_seizure_record isr
-                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3' -- 已归档状态
-          AND isi.category_code_one IS NOT NULL
-          AND isi.category_name_one IS NOT NULL
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        AND isi.category_code_one IS NOT NULL
+        AND isi.category_name_one IS NOT NULL
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
         GROUP BY isi.category_code_one, isi.category_name_one
         ORDER BY quantity DESC
     </select>
@@ -26,28 +35,46 @@
     <select id="selectStationTotalQuantity" resultType="java.lang.Long">
         SELECT IFNULL(SUM(isi.quantity), 0)
         FROM item_seizure_record isr
-                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3' -- 已归档状态
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
     </select>
 
     <!-- 按部位统计隐匿夹带查获数据 -->
     <select id="selectStationConcealmentPositionStats"
             resultType="com.sundot.airport.item.domain.dto.ItemCategoryStatsDTO$CategoryStat">
         SELECT isi.check_position_code_two AS categoryCodeOne,
-               isi.check_position_name_two AS categoryNameOne,
-               SUM(isi.quantity)           AS quantity
+        isi.check_position_name_two AS categoryNameOne,
+        SUM(isi.quantity) AS quantity
         FROM item_seizure_record isr
-                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3'      -- 已归档状态
-          AND isi.is_active_concealment = 1 -- 是否隐匿夹带为"是"
-          AND isi.check_position_code_two IS NOT NULL
-          AND isi.check_position_name_two IS NOT NULL
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        AND isi.is_active_concealment = 1 -- 是否隐匿夹带为"是"
+        AND isi.check_position_code_two IS NOT NULL
+        AND isi.check_position_name_two IS NOT NULL
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
         GROUP BY isi.check_position_code_two, isi.check_position_name_two
         ORDER BY quantity DESC
     </select>
@@ -56,28 +83,46 @@
     <select id="selectStationConcealmentTotalQuantity" resultType="java.lang.Long">
         SELECT IFNULL(SUM(isi.quantity), 0)
         FROM item_seizure_record isr
-                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3' -- 已归档状态
-          AND isi.is_active_concealment = 1 -- 是否隐匿夹带为"是"
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        AND isi.is_active_concealment = 1 -- 是否隐匿夹带为"是"
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
     </select>
 
     <!-- 按岗位第二级分类统计查获数据 -->
     <select id="selectStationPostCategoryStats"
             resultType="com.sundot.airport.item.domain.dto.ItemCategoryStatsDTO$CategoryStat">
-        SELECT isr.check_method      AS categoryCodeOne,
-               isr.check_method_desc AS categoryNameOne,
-               SUM(isi.quantity)     AS quantity
+        SELECT isr.check_method AS categoryCodeOne,
+        isr.check_method_desc AS categoryNameOne,
+        SUM(isi.quantity) AS quantity
         FROM item_seizure_record isr
-                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3' -- 已归档状态
-          AND isr.check_method IS NOT NULL
-          AND isr.check_method_desc IS NOT NULL
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        AND isr.check_method IS NOT NULL
+        AND isr.check_method_desc IS NOT NULL
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
         GROUP BY isr.check_method, isr.check_method_desc
         ORDER BY quantity DESC
     </select>
@@ -86,33 +131,51 @@
     <select id="selectStationPostCategoryTotalQuantity" resultType="java.lang.Long">
         SELECT IFNULL(SUM(isi.quantity), 0)
         FROM item_seizure_record isr
-                 LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
         WHERE isr.inspect_station_id = #{stationId}
-          AND isr.seizure_time >= #{startTime}
-          AND isr.seizure_time &lt;= #{endTime}
-          AND isr.process_status = '3' -- 已归档状态
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
     </select>
 
     <!-- 查询全站通道排名前五数据 -->
     <select id="selectTopFiveChannelRankings"
             resultType="com.sundot.airport.item.domain.dto.ChannelRankingStatsDTO$ChannelRankingItem">
         SELECT t.channelName,
-               t.seizureQuantity,
-               t.regionalName,
-               (@row_number := @row_number + 1) AS ranking
-        FROM (SELECT isr.channel_name  AS channelName,
-                     SUM(isi.quantity) AS seizureQuantity,
-                     isr.regional_name AS regionalName
-              FROM item_seizure_record isr
-                       LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
-              WHERE isr.inspect_station_id = #{stationId}
-                AND isr.seizure_time >= #{startTime}
-                AND isr.seizure_time &lt;= #{endTime}
-                AND isr.process_status = '3' -- 已归档状态
-                AND isr.channel_name IS NOT NULL
-                AND isr.regional_name IS NOT NULL
-              GROUP BY isr.channel_name, isr.regional_name
-              ORDER BY seizureQuantity DESC LIMIT 5) t
-                 CROSS JOIN (SELECT @row_number := 0) r
+        t.seizureQuantity,
+        t.regionalName,
+        (@row_number := @row_number + 1) AS ranking
+        FROM (SELECT isr.channel_name AS channelName,
+        SUM(isi.quantity) AS seizureQuantity,
+        isr.regional_name AS regionalName
+        FROM item_seizure_record isr
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        WHERE isr.inspect_station_id = #{stationId}
+        AND isr.seizure_time >= #{startTime}
+        AND isr.seizure_time &lt;= #{endTime}
+        AND isr.process_status = '3' -- 已归档状态
+        AND isr.channel_name IS NOT NULL
+        AND isr.regional_name IS NOT NULL
+        <if test="departmentId != null">
+            AND isr.inspect_department_id = #{departmentId}
+        </if>
+        <if test="teamId != null">
+            AND isr.inspect_team_id = #{teamId}
+        </if>
+        <if test="userId != null">
+            AND isr.inspect_user_id = #{userId}
+        </if>
+        GROUP BY isr.channel_name, isr.regional_name
+        ORDER BY seizureQuantity DESC LIMIT 5) t
+        CROSS JOIN (SELECT @row_number := 0) r
     </select>
 </mapper>

airport-item/src/main/resources/mapper/item/ItemLargeScreenMapper.xml

@@ -74,6 +74,7 @@
         <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
+        <if test="userId != null">and isr.inspect_user_id = #{userId}</if>
         and isr.process_status=3
         order by isr.seizure_time desc
     </select>
@@ -398,6 +399,7 @@
         <if test="inspectBrigadeId != null">and isr.inspect_brigade_id = #{inspectBrigadeId}</if>
         <if test="inspectDepartmentId != null">and isr.inspect_department_id = #{inspectDepartmentId}</if>
         <if test="inspectTeamId != null">and isr.inspect_team_id = #{inspectTeamId}</if>
+        <if test="userId != null">and isr.inspect_user_id = #{userId}</if>
         <if test="isPolice=='1' or isPolice==1 ">and isi.handling_method = 'TRANSFER_TO_AIRPORT_POLICE'</if>
         <if test="isConceal=='1' or  isConceal==1 ">and isi.is_active_concealment = 1</if>
         group by hours.hour
@@ -703,6 +705,15 @@
         <if test="inspectStationId != null">
             and isr.inspect_station_id = #{inspectStationId}
         </if>
+        <if test="inspectBrigadeId != null">
+            and isr.inspect_brigade_id = #{inspectBrigadeId}
+        </if>
+        <if test="inspectDepartmentId != null">
+            and isr.inspect_department_id = #{inspectDepartmentId}
+        </if>
+        <if test="inspectTeamId != null">
+            and isr.inspect_team_id = #{inspectTeamId}
+        </if>
         and isr.process_status = 3
         order by isr.seizure_time desc
     </select>
@@ -726,6 +737,15 @@
         <if test="inspectStationId != null">
             and isr.inspect_station_id = #{inspectStationId}
         </if>
+        <if test="inspectBrigadeId != null">
+            and isr.inspect_brigade_id = #{inspectBrigadeId}
+        </if>
+        <if test="inspectDepartmentId != null">
+            and isr.inspect_department_id = #{inspectDepartmentId}
+        </if>
+        <if test="inspectTeamId != null">
+            and isr.inspect_team_id = #{inspectTeamId}
+        </if>
         and isr.process_status = 3
         and isr.xray_operator_id is not null
         group by isr.xray_operator_id, isr.xray_operator_name

airport-item/src/main/resources/mapper/item/SeizureReportMapper.xml

@@ -254,6 +254,65 @@
         ORDER BY seizureCount DESC
     </select>
 
+    <!-- 查询科室排名（根据大队 ID） -->
+    <select id="selectDepartmentRankingsByBrigadeId"
+            resultType="com.sundot.airport.item.domain.home.SeizureReportDTO$DepartmentRankingItem">
+        SELECT
+        sd.dept_name AS departmentName,
+        COALESCE(SUM(isi.quantity), 0) AS seizureCount
+        FROM sys_dept sd
+        LEFT JOIN item_seizure_record isr ON sd.dept_id = isr.inspect_team_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        AND isr.process_status = 3
+        <if test="startDate != null and endDate != null">
+            AND isr.create_time BETWEEN #{startDate} AND #{endDate}
+        </if>
+        WHERE sd.parent_id = #{brigadeId} -- 大队 ID
+        AND sd.del_flag = '0'
+        AND sd.dept_type = 'MANAGER' -- 确保是科室
+        GROUP BY sd.dept_id, sd.dept_name
+        ORDER BY seizureCount DESC
+    </select>
+
+    <!-- 查询班组排名（根据科室 ID） -->
+    <select id="selectTeamRankingsByDepartmentId"
+            resultType="com.sundot.airport.item.domain.home.SeizureReportDTO$TeamRankingItem">
+        SELECT
+        sd.dept_name AS teamName,
+        COALESCE(SUM(isi.quantity), 0) AS seizureCount
+        FROM sys_dept sd
+        LEFT JOIN item_seizure_record isr ON sd.dept_id = isr.inspect_team_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        AND isr.process_status = 3
+        <if test="startDate != null and endDate != null">
+            AND isr.create_time BETWEEN #{startDate} AND #{endDate}
+        </if>
+        WHERE sd.parent_id = #{departmentId} -- 科室 ID
+        AND sd.del_flag = '0'
+        AND sd.dept_type = 'TEAMS' -- 确保是班组
+        GROUP BY sd.dept_id, sd.dept_name
+        ORDER BY seizureCount DESC
+    </select>
+
+    <!-- 查询用户排名（根据班组 ID） -->
+    <select id="selectUserRankingsByTeamId"
+            resultType="com.sundot.airport.item.domain.home.SeizureReportDTO$UserRankingItem">
+        SELECT
+        su.nick_name AS userName,
+        COALESCE(SUM(isi.quantity), 0) AS seizureCount
+        from sys_user su
+        LEFT JOIN item_seizure_record isr ON su.user_id = isr.inspect_user_id
+        LEFT JOIN item_seizure_items isi ON isr.id = isi.record_id
+        AND isr.process_status = 3
+        <if test="startDate != null and endDate != null">
+            AND isr.create_time BETWEEN #{startDate} AND #{endDate}
+        </if>
+        where su.dept_id = #{teamId}
+        and su.del_flag = '0'
+        GROUP BY su.user_id
+        ORDER BY seizureCount DESC
+    </select>
+
     <!-- 查询排名前三的班组 -->
     <select id="selectTopThreeTeams" resultType="com.sundot.airport.item.domain.home.SeizureReportDTO$TopThreeTeamItem">
         SELECT

airport-system/src/main/java/com/sundot/airport/system/mapper/SysUserMapper.java

@@ -238,4 +238,12 @@ public interface SysUserMapper {
      * @return 用户信息集合
      */
     public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(@Param("deptId") Long deptId, @Param("list") List<String> list, @Param("nickName") String nickName);
+
+    /**
+     * 首页 - 用户信息（按大队 ID 筛选）
+     *
+     * @param brigadeId 大队 ID
+     * @return 用户信息列表
+     */
+    public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(@Param("brigadeId") Long brigadeId);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -328,4 +328,12 @@ public interface ISysUserService {
      * @return 用户信息集合
      */
     public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto);
+
+    /**
+     * 首页 - 用户信息（按大队 ID 筛选）
+     *
+     * @param brigadeId 大队 ID
+     * @return 用户信息列表
+     */
+    public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(Long brigadeId);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -1197,4 +1197,9 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto) {
         return userMapper.selectUserListByDeptIdAndRoleKeyListAndUserName(dto.getDeptId(), dto.getRoleKeyList(), dto.getNickName());
     }
+
+    @Override
+    public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(Long brigadeId) {
+        return userMapper.homePageUserInfoByBrigadeId(brigadeId);
+    }
 }

airport-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1040,4 +1040,28 @@
         where 1 = 1
           and sr.role_key in ('banzuzhang', 'SecurityCheck')
     </select>
+
+    <select id="homePageUserInfoByBrigadeId" resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
+        select su.user_id      userId,
+               su.user_name    userName,
+               su.nick_name    nickName,
+               sd_bz.dept_id   teamId,
+               sd_bz.dept_name teamName,
+               sd_ks.dept_id   departmentId,
+               sd_ks.dept_name departmentName,
+               sd_dd.dept_id   brigadeId,
+               sd_dd.dept_name brigadeName,
+               sd_zj.dept_id   stationId,
+               sd_zj.dept_name stationName
+        from sys_user su
+                 inner join sys_user_role sur on sur.user_id = su.user_id
+                 inner join sys_role sr on sr.role_id = sur.role_id
+                 inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
+                 inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
+                 inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
+                 inner join sys_dept sd_zj on sd_zj.dept_id = sd_dd.parent_id
+        where 1 = 1
+          and sr.role_key in ('banzuzhang', 'SecurityCheck')
+          and sd_dd.dept_id = #{brigadeId}
+    </select>
 </mapper>