资质等级

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

@@ -51,10 +51,10 @@ public class QualificationLevelStatsController extends BaseController {
 
 
     /**
-     * 固定的资质等级列表（一级到五级）
+     * 固定的资质等级列表（初级、中级、高级）
      */
     private static final List<String> QUALIFICATION_LEVELS = Arrays.asList(
-            "一级", "二级", "三级", "四级", "五级"
+            "初级", "中级", "高级"
     );
 
     /**
@@ -120,31 +120,49 @@ public class QualificationLevelStatsController extends BaseController {
         List<QualificationLevelStatsDTO.LevelDistribution> distributions = new ArrayList<>();
         int totalPersons = 0;
 
-        // 统计实际存在的等级数据
-        Map<String, QualificationStats> statsMap = statsList.stream()
+        // 统计实际存在的等级数据，按数据库存储的枚举值分组
+        Map<String, Integer> levelCountMap = statsList.stream()
                 .collect(Collectors.toMap(
-                        stat -> QualificationLevelConverter.toDisplay(stat.getLevelName()),
-                        s -> s
+                        QualificationStats::getLevelName,
+                        QualificationStats::getCount,
+                        Integer::sum
                 ));
 
-        // 按固定顺序处理所有等级
-        for (String levelName : QUALIFICATION_LEVELS) {
-            QualificationLevelStatsDTO.LevelDistribution distribution = new QualificationLevelStatsDTO.LevelDistribution();
-            distribution.setLevelName(levelName);
-
-            QualificationStats stats = statsMap.get(levelName);
-            if (stats != null) {
-                distribution.setCount(stats.getCount());
-                distribution.setPercentage(new BigDecimal(stats.getPercentage()).setScale(2, RoundingMode.HALF_UP));
-                totalPersons += stats.getCount();
-            } else {
-                // 该等级无人
-                distribution.setCount(0);
-                distribution.setPercentage(BigDecimal.ZERO);
-            }
-
-            distributions.add(distribution);
-        }
+        // 按（初级、中级、高级）分组统计
+        int juniorCount = levelCountMap.getOrDefault("LEVEL_FIVE", 0);  // 初级
+        int intermediateCount = levelCountMap.getOrDefault("LEVEL_FOUR", 0);  // 中级
+        int seniorCount = levelCountMap.getOrDefault("LEVEL_ONE", 0) +
+                levelCountMap.getOrDefault("LEVEL_TWO", 0) +
+                levelCountMap.getOrDefault("LEVEL_THREE", 0);  // 高级
+
+        totalPersons = userIds.size();
+
+        // 初级
+        QualificationLevelStatsDTO.LevelDistribution juniorDist = new QualificationLevelStatsDTO.LevelDistribution();
+        juniorDist.setLevelName("初级");
+        juniorDist.setCount(juniorCount);
+        juniorDist.setPercentage(totalPersons > 0 ?
+                new BigDecimal(juniorCount * 100.0 / totalPersons).setScale(2, RoundingMode.HALF_UP) :
+                BigDecimal.ZERO);
+        distributions.add(juniorDist);
+
+        // 中级
+        QualificationLevelStatsDTO.LevelDistribution intermediateDist = new QualificationLevelStatsDTO.LevelDistribution();
+        intermediateDist.setLevelName("中级");
+        intermediateDist.setCount(intermediateCount);
+        intermediateDist.setPercentage(totalPersons > 0 ?
+                new BigDecimal(intermediateCount * 100.0 / totalPersons).setScale(2, RoundingMode.HALF_UP) :
+                BigDecimal.ZERO);
+        distributions.add(intermediateDist);
+
+        // 高级
+        QualificationLevelStatsDTO.LevelDistribution seniorDist = new QualificationLevelStatsDTO.LevelDistribution();
+        seniorDist.setLevelName("高级");
+        seniorDist.setCount(seniorCount);
+        seniorDist.setPercentage(totalPersons > 0 ?
+                new BigDecimal(seniorCount * 100.0 / totalPersons).setScale(2, RoundingMode.HALF_UP) :
+                BigDecimal.ZERO);
+        distributions.add(seniorDist);
 
         pieChart.setData(distributions);
         pieChart.setTotalPersons(totalPersons);
@@ -243,21 +261,38 @@ public class QualificationLevelStatsController extends BaseController {
     }
 
     /**
-     * 将资质统计转换为等级人数数据
+     * 将资质统计转换为等级人数数据（初级、中级、高级）
      */
     private List<QualificationLevelStatsDTO.LevelCount> convertToLevelCounts(List<QualificationStats> statsList) {
+        // 按数据库存储的枚举值分组统计
         Map<String, Integer> countMap = statsList.stream()
                 .collect(Collectors.toMap(QualificationStats::getLevelName, QualificationStats::getCount));
 
-        return QUALIFICATION_LEVELS.stream()
-                .map(level -> {
-                    String levelName = QualificationLevelConverter.toDatabase(level);
-                    QualificationLevelStatsDTO.LevelCount count = new QualificationLevelStatsDTO.LevelCount();
-                    count.setLevelName(level);
-                    count.setCount(countMap.getOrDefault(levelName, 0));
-                    return count;
-                })
-                .collect(Collectors.toList());
+        // 计算初级、中级、高级的人数
+        int juniorCount = countMap.getOrDefault("LEVEL_FIVE", 0);  // 初级
+        int intermediateCount = countMap.getOrDefault("LEVEL_FOUR", 0);  // 中级
+        int seniorCount = countMap.getOrDefault("LEVEL_ONE", 0) +
+                countMap.getOrDefault("LEVEL_TWO", 0) +
+                countMap.getOrDefault("LEVEL_THREE", 0);  // 高级
+
+        List<QualificationLevelStatsDTO.LevelCount> levelCounts = new ArrayList<>();
+
+        QualificationLevelStatsDTO.LevelCount junior = new QualificationLevelStatsDTO.LevelCount();
+        junior.setLevelName("初级");
+        junior.setCount(juniorCount);
+        levelCounts.add(junior);
+
+        QualificationLevelStatsDTO.LevelCount intermediate = new QualificationLevelStatsDTO.LevelCount();
+        intermediate.setLevelName("中级");
+        intermediate.setCount(intermediateCount);
+        levelCounts.add(intermediate);
+
+        QualificationLevelStatsDTO.LevelCount senior = new QualificationLevelStatsDTO.LevelCount();
+        senior.setLevelName("高级");
+        senior.setCount(seniorCount);
+        levelCounts.add(senior);
+
+        return levelCounts;
     }