非干部职能部门统计

airport-admin/src/main/java/com/sundot/airport/web/controller/personnel/PersonnelNonCadreMonthlyAssessmentScoreSummaryController.java

@@ -5,6 +5,9 @@ import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.personnel.dto.AssessmentSummaryDto;
+import com.sundot.airport.personnel.dto.FunctionalDeptSummaryDto;
+import com.sundot.airport.personnel.dto.FunctionalDeptPersonnelDistributionDto;
+import com.sundot.airport.personnel.dto.FunctionalDeptDistributionPieDto;
 import com.sundot.airport.personnel.dto.AssessmentTeamActualImprovementDistributionDto;
 import com.sundot.airport.personnel.dto.AssessmentTeamActualIncompetentDistributionDto;
 import com.sundot.airport.personnel.dto.DeptActualImprovementDistributionDto;
@@ -147,12 +150,19 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
             // 构建大队到其所有子部门ID的映射
             Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(deptMap);
 
+            // 批量查询用户部门映射
+            Set<Long> userIds = list.stream()
+                    .map(PersonnelNonCadreMonthlyAssessment::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
+
             // 按大队统计人数
             Map<Long, Integer> brigadeCountMap = new HashMap<>();
             int totalCount = list.size();
 
             for (PersonnelNonCadreMonthlyAssessment item : list) {
-                Long userDeptId = getUserDeptId(item.getUserId());
+                Long userDeptId = userDeptIdMap.get(item.getUserId());
                 if (userDeptId != null) {
                     // 查找该用户所属的大队
                     Long brigadeId = findUserBrigade(userDeptId, brigadeSubDeptsMap);
@@ -223,6 +233,13 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
             // 构建大队到其所有子部门ID的映射
             Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(deptMap);
 
+            // 批量查询用户部门映射
+            Set<Long> userIds = list.stream()
+                    .map(PersonnelNonCadreMonthlyAssessment::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
+
             // 定义6个分数段
             String[] rangeKeys = {"below70", "70-75", "75-80", "80-85", "85-90", "above90"};
             String[] rangeLabels = {"低于70", "[70-75)", "[75-80)", "[80-85)", "[85-90)", "90以上"};
@@ -234,7 +251,7 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
 
             // 统计每个分数段下各大队的人数
             for (PersonnelNonCadreMonthlyAssessment item : list) {
-                Long userDeptId = getUserDeptId(item.getUserId());
+                Long userDeptId = userDeptIdMap.get(item.getUserId());
                 if (userDeptId == null) {
                     continue;
                 }
@@ -581,7 +598,7 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
                 return success(Collections.emptyList());
             }
     
-            // 批量查询用户部门信息，避免N+1问题
+            // 批量查询用户部门信息
             Set<Long> userIds = actualIncompetentList.stream()
                     .map(PersonnelNonCadreMonthlyAssessment::getUserId)
                     .filter(Objects::nonNull)
@@ -630,16 +647,24 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
-     * 批量构建用户到部门的映射
+     * 批量构建用户到部门的映射（批量查询，避免N+1问题）
      */
     private Map<Long, Long> buildUserDeptIdMap(Set<Long> userIds) {
         Map<Long, Long> userDeptIdMap = new HashMap<>();
-        for (Long userId : userIds) {
-            Long deptId = getUserDeptId(userId);
-            if (deptId != null) {
-                userDeptIdMap.put(userId, deptId);
+        
+        if (userIds == null || userIds.isEmpty()) {
+            return userDeptIdMap;
+        }
+        
+        // 批量查询用户信息
+        List<SysUser> users = sysUserService.selectByUserIdList(new ArrayList<>(userIds));
+        
+        for (SysUser user : users) {
+            if (user != null && user.getDeptId() != null) {
+                userDeptIdMap.put(user.getUserId(), user.getDeptId());
             }
         }
+        
         return userDeptIdMap;
     }
 
@@ -893,6 +918,8 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
         }
     }
 
+
+
     /**
      * 大队考核组统计
      * 先按大队筛选，再按考核组统计，应用汇总统计规则
@@ -1247,4 +1274,375 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
             return error("统计失败：" + e.getMessage());
         }
     }
+
+    /**
+     * 各职能大队汇总
+     * 统计所有职能部门
+     *
+     * @param assessmentMonth 考核月份（格式:YYYYMM）
+     * @return 各职能大队汇总数据，包含小计
+     */
+    @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
+    @GetMapping("/functional-dept-summary")
+    public AjaxResult getFunctionalDeptSummary(@RequestParam String assessmentMonth) {
+        try {
+            List<PersonnelNonCadreMonthlyAssessment> allList = queryByMonth(assessmentMonth);
+
+            if (allList == null || allList.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 获取所有部门信息
+            Map<Long, SysDept> deptMap = getDeptMap();
+
+            // 查询用户部门映射
+            Set<Long> userIds = allList.stream()
+                    .map(PersonnelNonCadreMonthlyAssessment::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
+
+            // 筛选所有职能部门（is_functional_dept='1'）
+            List<SysDept> functionalDepts = deptMap.values().stream()
+                    .filter(dept -> "1".equals(dept.getIsFunctionalDept()))
+                    .collect(Collectors.toList());
+
+            if (functionalDepts.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 用于累加小计数据
+            int totalAssessmentTeamCount = 0;
+            int totalEstimatedImprovementCount = 0;
+            int totalImprovementTotalCount = 0;
+            int totalImprovementExemptedCount = 0;
+            int totalActualImprovementCount = 0;
+            int totalIncompetentTotalCount = 0;
+            int totalIncompetentExemptedCount = 0;
+            int totalActualIncompetentCount = 0;
+
+            // 构建返回结果
+            List<FunctionalDeptSummaryDto> result = new ArrayList<>();
+
+            for (SysDept functionalDept : functionalDepts) {
+                Long deptId = functionalDept.getDeptId();
+                String deptName = functionalDept.getDeptName();
+
+                // 获取该职能部门及其所有子部门的ID集合
+                Set<Long> functionalSubDeptIds = getAllSubDeptIds(deptId, deptMap);
+
+                // 筛选属于该职能部门的人员（包括子部门）
+                List<PersonnelNonCadreMonthlyAssessment> deptRecords = allList.stream()
+                        .filter(item -> {
+                            Long userDeptId = userDeptIdMap.get(item.getUserId());
+                            return userDeptId != null && functionalSubDeptIds.contains(userDeptId);
+                        })
+                        .collect(Collectors.toList());
+
+                if (deptRecords.isEmpty()) {
+                    continue;
+                }
+
+                // 按考核组分组
+                Map<String, List<PersonnelNonCadreMonthlyAssessment>> teamGroupMap = deptRecords.stream()
+                        .filter(item -> item.getAssessmentTeam() != null && !item.getAssessmentTeam().isEmpty())
+                        .collect(Collectors.groupingBy(PersonnelNonCadreMonthlyAssessment::getAssessmentTeam));
+
+                List<FunctionalDeptSummaryDto.FunctionalTeamStatisticsDto> teamStatsList = new ArrayList<>();
+
+                for (Map.Entry<String, List<PersonnelNonCadreMonthlyAssessment>> teamEntry : teamGroupMap.entrySet()) {
+                    String assessmentTeam = teamEntry.getKey();
+                    List<PersonnelNonCadreMonthlyAssessment> teamRecords = teamEntry.getValue();
+
+                    // 统计该考核组的数据
+                    int assessmentTeamCount = teamRecords.size();
+                    int estimatedImprovementCount = (int) Math.ceil(assessmentTeamCount * 0.05);
+
+                    int improvementTotalCount = 0;
+                    int improvementExemptedCount = 0;
+                    int incompetentTotalCount = 0;
+                    int incompetentExemptedCount = 0;
+
+                    for (PersonnelNonCadreMonthlyAssessment item : teamRecords) {
+                        String assessmentResult = item.getAssessmentResult();
+                        String exemption = item.getExemption();
+
+                        if (RESULT_IMPROVEMENT.equals(assessmentResult)) {
+                            improvementTotalCount++;
+                            if (EXEMPTION_YES.equals(exemption)) {
+                                improvementExemptedCount++;
+                            }
+                        } else if (RESULT_INCOMPETENT.equals(assessmentResult)) {
+                            incompetentTotalCount++;
+                            if (EXEMPTION_YES.equals(exemption)) {
+                                incompetentExemptedCount++;
+                            }
+                        }
+                    }
+
+                    int actualImprovementCount = Math.max(0, improvementTotalCount - improvementExemptedCount);
+                    int actualIncompetentCount = Math.max(0, incompetentTotalCount - incompetentExemptedCount);
+
+                    // 构建考核组统计数据
+                    FunctionalDeptSummaryDto.FunctionalTeamStatisticsDto teamDto =
+                            new FunctionalDeptSummaryDto.FunctionalTeamStatisticsDto();
+                    teamDto.setAssessmentTeam(assessmentTeam);
+                    teamDto.setAssessmentTeamCount(assessmentTeamCount);
+                    teamDto.setEstimatedImprovementCount(estimatedImprovementCount);
+                    teamDto.setImprovementTotalCount(improvementTotalCount);
+                    teamDto.setImprovementExemptedCount(improvementExemptedCount);
+                    teamDto.setActualImprovementCount(actualImprovementCount);
+                    teamDto.setIncompetentTotalCount(incompetentTotalCount);
+                    teamDto.setIncompetentExemptedCount(incompetentExemptedCount);
+                    teamDto.setActualIncompetentCount(actualIncompetentCount);
+
+                    teamStatsList.add(teamDto);
+
+                    // 累加到小计
+                    totalAssessmentTeamCount += assessmentTeamCount;
+                    totalEstimatedImprovementCount += estimatedImprovementCount;
+                    totalImprovementTotalCount += improvementTotalCount;
+                    totalImprovementExemptedCount += improvementExemptedCount;
+                    totalActualImprovementCount += actualImprovementCount;
+                    totalIncompetentTotalCount += incompetentTotalCount;
+                    totalIncompetentExemptedCount += incompetentExemptedCount;
+                    totalActualIncompetentCount += actualIncompetentCount;
+                }
+
+                // 构建职能部门统计数据
+                FunctionalDeptSummaryDto deptDto = new FunctionalDeptSummaryDto();
+                deptDto.setDeptId(deptId);
+                deptDto.setDeptName(deptName);
+                deptDto.setAssessmentTeams(teamStatsList);
+                result.add(deptDto);
+            }
+
+            // 添加小计行（合并所有考核组的数据）
+            FunctionalDeptSummaryDto.FunctionalTeamStatisticsDto summaryDto =
+                    new FunctionalDeptSummaryDto.FunctionalTeamStatisticsDto();
+            summaryDto.setAssessmentTeam("小计");
+            summaryDto.setAssessmentTeamCount(totalAssessmentTeamCount);
+            summaryDto.setEstimatedImprovementCount(totalEstimatedImprovementCount);
+            summaryDto.setImprovementTotalCount(totalImprovementTotalCount);
+            summaryDto.setImprovementExemptedCount(totalImprovementExemptedCount);
+            summaryDto.setActualImprovementCount(totalActualImprovementCount);
+            summaryDto.setIncompetentTotalCount(totalIncompetentTotalCount);
+            summaryDto.setIncompetentExemptedCount(totalIncompetentExemptedCount);
+            summaryDto.setActualIncompetentCount(totalActualIncompetentCount);
+
+            // 将小计作为一个单独的部门添加到结果中
+            FunctionalDeptSummaryDto summaryDept = new FunctionalDeptSummaryDto();
+            summaryDept.setDeptName("小计");
+            summaryDept.setAssessmentTeams(Collections.singletonList(summaryDto));
+            result.add(summaryDept);
+
+            return success(result);
+        } catch (Exception e) {
+            logger.error("各职能大队汇总统计异常", e);
+            return error("统计失败：" + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 各职能部门待改进、不称职人员分布
+     *
+     * @param assessmentMonth 考核月份（格式:YYYYMM）
+     * @return 各职能部门人员分布数据
+     */
+    @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
+    @GetMapping("/functional-dept-personnel-distribution")
+    public AjaxResult getFunctionalDeptPersonnelDistribution(@RequestParam String assessmentMonth) {
+        try {
+            List<PersonnelNonCadreMonthlyAssessment> allList = queryByMonth(assessmentMonth);
+
+            if (allList == null || allList.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 获取所有部门信息
+            Map<Long, SysDept> deptMap = getDeptMap();
+
+            // 查询用户部门映射
+            Set<Long> userIds = allList.stream()
+                    .map(PersonnelNonCadreMonthlyAssessment::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
+
+            // 筛选所有职能部门（is_functional_dept='1'）
+            List<SysDept> functionalDepts = deptMap.values().stream()
+                    .filter(dept -> "1".equals(dept.getIsFunctionalDept()))
+                    .collect(Collectors.toList());
+
+            if (functionalDepts.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 构建返回结果
+            List<FunctionalDeptPersonnelDistributionDto> result = new ArrayList<>();
+
+            for (SysDept functionalDept : functionalDepts) {
+                Long deptId = functionalDept.getDeptId();
+                String deptName = functionalDept.getDeptName();
+
+                // 获取该职能部门及其所有子部门的ID集合
+                Set<Long> functionalSubDeptIds = getAllSubDeptIds(deptId, deptMap);
+
+                // 筛选属于该职能部门的人员（包括子部门）
+                List<PersonnelNonCadreMonthlyAssessment> deptRecords = allList.stream()
+                        .filter(item -> {
+                            Long userDeptId = userDeptIdMap.get(item.getUserId());
+                            return userDeptId != null && functionalSubDeptIds.contains(userDeptId);
+                        })
+                        .filter(item -> item.getAssessmentTeam() != null && !item.getAssessmentTeam().isEmpty())
+                        .collect(Collectors.toList());
+
+                if (deptRecords.isEmpty()) {
+                    continue;
+                }
+
+                // 统计考核组人数
+                int assessmentTeamCount = deptRecords.size();
+
+                // 统计实际待改进人数：考核结果为"待改进"且未被豁免
+                long actualImprovementCount = deptRecords.stream()
+                        .filter(item -> RESULT_IMPROVEMENT.equals(item.getAssessmentResult()))
+                        .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))
+                        .count();
+
+                // 统计实际不称职人数：考核结果为"不称职"且未被豁免
+                long actualIncompetentCount = deptRecords.stream()
+                        .filter(item -> RESULT_INCOMPETENT.equals(item.getAssessmentResult()))
+                        .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))
+                        .count();
+
+                // 构建DTO
+                FunctionalDeptPersonnelDistributionDto dto = new FunctionalDeptPersonnelDistributionDto();
+                dto.setDeptId(deptId);
+                dto.setDeptName(deptName);
+                dto.setAssessmentTeamCount(assessmentTeamCount);
+                dto.setActualImprovementCount((int) actualImprovementCount);
+                dto.setActualIncompetentCount((int) actualIncompetentCount);
+
+                result.add(dto);
+            }
+
+            // 按考核组人数降序排序
+            result.sort((a, b) -> b.getAssessmentTeamCount().compareTo(a.getAssessmentTeamCount()));
+
+            return success(result);
+        } catch (Exception e) {
+            logger.error("各职能部门人员分布统计异常", e);
+            return error("统计失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 各职能考核人员分布（饼图数据）
+     * 统计所有职能部门（is_functional_dept='1'）的考核组人数及占比
+     *
+     * @param assessmentMonth 考核月份（格式:YYYYMM）
+     * @return 各职能考核人员分布数据
+     */
+    @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
+    @GetMapping("/functional-dept-distribution-pie")
+    public AjaxResult getFunctionalDeptDistributionPie(@RequestParam String assessmentMonth) {
+        try {
+            List<PersonnelNonCadreMonthlyAssessment> allList = queryByMonth(assessmentMonth);
+
+            if (allList == null || allList.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 获取所有部门信息
+            Map<Long, SysDept> deptMap = getDeptMap();
+
+            // 查询用户部门映射
+            Set<Long> userIds = allList.stream()
+                    .map(PersonnelNonCadreMonthlyAssessment::getUserId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
+
+            // 筛选所有职能部门（is_functional_dept='1'）
+            List<SysDept> functionalDepts = deptMap.values().stream()
+                    .filter(dept -> "1".equals(dept.getIsFunctionalDept()))
+                    .collect(Collectors.toList());
+
+            if (functionalDepts.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 统计总人数
+            int totalCount = 0;
+
+            // 先统计各职能部门人数
+            Map<Long, Integer> deptCountMap = new HashMap<>();
+            Map<Long, String> deptNameMap = new HashMap<>();
+            Map<Long, String> deptTeamMap = new HashMap<>();
+
+            for (SysDept functionalDept : functionalDepts) {
+                Long deptId = functionalDept.getDeptId();
+                String deptName = functionalDept.getDeptName();
+
+                // 获取该职能部门及其所有子部门的ID集合
+                Set<Long> functionalSubDeptIds = getAllSubDeptIds(deptId, deptMap);
+
+                // 筛选属于该职能部门的人员（包括子部门）
+                List<PersonnelNonCadreMonthlyAssessment> deptRecords = allList.stream()
+                        .filter(item -> {
+                            Long userDeptId = userDeptIdMap.get(item.getUserId());
+                            return userDeptId != null && functionalSubDeptIds.contains(userDeptId);
+                        })
+                        .filter(item -> item.getAssessmentTeam() != null && !item.getAssessmentTeam().isEmpty())
+                        .collect(Collectors.toList());
+
+                if (!deptRecords.isEmpty()) {
+                    int count = deptRecords.size();
+                    deptCountMap.put(deptId, count);
+                    deptNameMap.put(deptId, deptName);
+                    // 获取考核组名称（取第一个非空考核组）
+                    String assessmentTeam = deptRecords.get(0).getAssessmentTeam();
+                    deptTeamMap.put(deptId, assessmentTeam);
+                    totalCount += count;
+                }
+            }
+
+            // 构建返回结果
+            List<FunctionalDeptDistributionPieDto> result = new ArrayList<>();
+            for (Map.Entry<Long, Integer> entry : deptCountMap.entrySet()) {
+                Long deptId = entry.getKey();
+                Integer count = entry.getValue();
+
+                FunctionalDeptDistributionPieDto dto = new FunctionalDeptDistributionPieDto();
+                dto.setDeptId(deptId);
+                dto.setDeptName(deptNameMap.get(deptId));
+                dto.setAssessmentTeam(deptTeamMap.get(deptId));
+                dto.setCount(count);
+
+                // 计算占比
+                if (totalCount > 0) {
+                    BigDecimal percentage = new BigDecimal(count)
+                            .divide(new BigDecimal(totalCount), 4, BigDecimal.ROUND_HALF_UP)
+                            .multiply(HUNDRED);
+                    dto.setPercentage(percentage.setScale(1, BigDecimal.ROUND_HALF_UP));
+                } else {
+                    dto.setPercentage(BigDecimal.ZERO);
+                }
+
+                result.add(dto);
+            }
+
+            // 按人数降序排序
+            result.sort((a, b) -> b.getCount().compareTo(a.getCount()));
+
+            return success(result);
+        } catch (Exception e) {
+            logger.error("各职能考核人员分布统计异常", e);
+            return error("统计失败：" + e.getMessage());
+        }
+    }
+
+
 }

airport-personnel/src/main/java/com/sundot/airport/personnel/dto/FunctionalDeptDistributionPieDto.java

@@ -0,0 +1,76 @@
+package com.sundot.airport.personnel.dto;
+
+import java.math.BigDecimal;
+
+/**
+ * 各职能考核人员分布DTO（饼图数据）
+ *
+ * @author wangxx
+ * @date 2026-05-11
+ */
+public class FunctionalDeptDistributionPieDto {
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 考核组名称（简称）
+     */
+    private String assessmentTeam;
+
+    /**
+     * 考核人数
+     */
+    private Integer count;
+
+    /**
+     * 占比（百分比）
+     */
+    private BigDecimal percentage;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getAssessmentTeam() {
+        return assessmentTeam;
+    }
+
+    public void setAssessmentTeam(String assessmentTeam) {
+        this.assessmentTeam = assessmentTeam;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public BigDecimal getPercentage() {
+        return percentage;
+    }
+
+    public void setPercentage(BigDecimal percentage) {
+        this.percentage = percentage;
+    }
+}

airport-personnel/src/main/java/com/sundot/airport/personnel/dto/FunctionalDeptPersonnelDistributionDto.java

@@ -0,0 +1,74 @@
+package com.sundot.airport.personnel.dto;
+
+/**
+ * 各职能部门待改进/不称职人员分布DTO
+ *
+ * @author wangxx
+ * @date 2026-05-11
+ */
+public class FunctionalDeptPersonnelDistributionDto {
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 职能部门名称
+     */
+    private String deptName;
+
+    /**
+     * 考核组人数
+     */
+    private Integer assessmentTeamCount;
+
+    /**
+     * 实际待改进人数
+     */
+    private Integer actualImprovementCount;
+
+    /**
+     * 实际不称职人数
+     */
+    private Integer actualIncompetentCount;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public Integer getAssessmentTeamCount() {
+        return assessmentTeamCount;
+    }
+
+    public void setAssessmentTeamCount(Integer assessmentTeamCount) {
+        this.assessmentTeamCount = assessmentTeamCount;
+    }
+
+    public Integer getActualImprovementCount() {
+        return actualImprovementCount;
+    }
+
+    public void setActualImprovementCount(Integer actualImprovementCount) {
+        this.actualImprovementCount = actualImprovementCount;
+    }
+
+    public Integer getActualIncompetentCount() {
+        return actualIncompetentCount;
+    }
+
+    public void setActualIncompetentCount(Integer actualIncompetentCount) {
+        this.actualIncompetentCount = actualIncompetentCount;
+    }
+}

airport-personnel/src/main/java/com/sundot/airport/personnel/dto/FunctionalDeptSummaryDto.java

@@ -0,0 +1,172 @@
+package com.sundot.airport.personnel.dto;
+
+import java.util.List;
+
+/**
+ * 各职能大队汇总DTO
+ *
+ * @author wangxx
+ * @date 2026-05-11
+ */
+public class FunctionalDeptSummaryDto {
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 职能部门名称
+     */
+    private String deptName;
+
+    /**
+     * 考核组列表
+     */
+    private List<FunctionalTeamStatisticsDto> assessmentTeams;
+
+    /**
+     * 考核组统计数据
+     */
+    public static class FunctionalTeamStatisticsDto {
+        /**
+         * 考核组名称
+         */
+        private String assessmentTeam;
+
+        /**
+         * 考核组人数
+         */
+        private Integer assessmentTeamCount;
+
+        /**
+         * 测算待改进人数
+         */
+        private Integer estimatedImprovementCount;
+
+        /**
+         * 待改进总人数
+         */
+        private Integer improvementTotalCount;
+
+        /**
+         * 待改进豁免人数
+         */
+        private Integer improvementExemptedCount;
+
+        /**
+         * 实际待改进人数
+         */
+        private Integer actualImprovementCount;
+
+        /**
+         * 不称职总人数
+         */
+        private Integer incompetentTotalCount;
+
+        /**
+         * 不称职豁免人数
+         */
+        private Integer incompetentExemptedCount;
+
+        /**
+         * 实际不称职人数
+         */
+        private Integer actualIncompetentCount;
+
+        public String getAssessmentTeam() {
+            return assessmentTeam;
+        }
+
+        public void setAssessmentTeam(String assessmentTeam) {
+            this.assessmentTeam = assessmentTeam;
+        }
+
+        public Integer getAssessmentTeamCount() {
+            return assessmentTeamCount;
+        }
+
+        public void setAssessmentTeamCount(Integer assessmentTeamCount) {
+            this.assessmentTeamCount = assessmentTeamCount;
+        }
+
+        public Integer getEstimatedImprovementCount() {
+            return estimatedImprovementCount;
+        }
+
+        public void setEstimatedImprovementCount(Integer estimatedImprovementCount) {
+            this.estimatedImprovementCount = estimatedImprovementCount;
+        }
+
+        public Integer getImprovementTotalCount() {
+            return improvementTotalCount;
+        }
+
+        public void setImprovementTotalCount(Integer improvementTotalCount) {
+            this.improvementTotalCount = improvementTotalCount;
+        }
+
+        public Integer getImprovementExemptedCount() {
+            return improvementExemptedCount;
+        }
+
+        public void setImprovementExemptedCount(Integer improvementExemptedCount) {
+            this.improvementExemptedCount = improvementExemptedCount;
+        }
+
+        public Integer getActualImprovementCount() {
+            return actualImprovementCount;
+        }
+
+        public void setActualImprovementCount(Integer actualImprovementCount) {
+            this.actualImprovementCount = actualImprovementCount;
+        }
+
+        public Integer getIncompetentTotalCount() {
+            return incompetentTotalCount;
+        }
+
+        public void setIncompetentTotalCount(Integer incompetentTotalCount) {
+            this.incompetentTotalCount = incompetentTotalCount;
+        }
+
+        public Integer getIncompetentExemptedCount() {
+            return incompetentExemptedCount;
+        }
+
+        public void setIncompetentExemptedCount(Integer incompetentExemptedCount) {
+            this.incompetentExemptedCount = incompetentExemptedCount;
+        }
+
+        public Integer getActualIncompetentCount() {
+            return actualIncompetentCount;
+        }
+
+        public void setActualIncompetentCount(Integer actualIncompetentCount) {
+            this.actualIncompetentCount = actualIncompetentCount;
+        }
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public List<FunctionalTeamStatisticsDto> getAssessmentTeams() {
+        return assessmentTeams;
+    }
+
+    public void setAssessmentTeams(List<FunctionalTeamStatisticsDto> assessmentTeams) {
+        this.assessmentTeams = assessmentTeams;
+    }
+}