资质等级

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -715,7 +715,7 @@ public class SysUserController extends BaseController {
         } else {
             List<QualificationStats> qualificationLevelStats = systemResult.getQualificationLevelStats();
             if (qualificationLevelStats != null) {
-                final String FIRST_LEVEL = "LEVEL_ONE";
+                final String FIRST_LEVEL = "高级";
                 Integer reduce = qualificationLevelStats.stream()
                         .filter(qualificationStats -> FIRST_LEVEL.equals(qualificationStats.getLevelName()))
                         .map(QualificationStats::getCount)

airport-system/src/main/java/com/sundot/airport/system/service/portrait/QualificationLevelIndicator.java

@@ -1,21 +1,17 @@
 package com.sundot.airport.system.service.portrait;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.domain.portrait.BaseModuleIndicatorResult;
 import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
 import com.sundot.airport.common.enums.portrait.IndicatorType;
 import com.sundot.airport.common.enums.portrait.UserType;
 import com.sundot.airport.common.service.portrait.Indicator;
-import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.system.domain.portrait.IndicatorResult;
-import com.sundot.airport.system.mapper.SysUserMapper;
+import com.sundot.airport.system.domain.portrait.QualificationStats;
 import com.sundot.airport.system.mapper.portrait.QualificationLevelIndicatorMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 资质等级指标类
@@ -69,13 +65,76 @@ public class QualificationLevelIndicator implements Indicator<Object> {
         List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人资质等级
-            this.value = mapper.queryPersonalQualificationLevel(userId);
+            String level = mapper.queryPersonalQualificationLevel(userId);
+            this.value = convertToDisplayLevel(level);
         } else {
             // 组织资质等级统计
-            this.value = mapper.queryOrgQualificationLevelStats(userIds, userType);
+            List<QualificationStats> stats = mapper.queryOrgQualificationLevelStats(userIds, userType);
+            this.value = convertStatsToDisplayLevel(stats);
         }
     }
 
+    /**
+     * 将数据库枚举值转换为显示名称（初级、中级、高级）
+     *
+     * @param dbValue 数据库枚举值（如 LEVEL_ONE）
+     * @return 显示名称（如 高级）
+     */
+    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;
+        }
+    }
+
+    /**
+     * 将资质等级统计列表转换为显示名称
+     *
+     * @param statsList 原始统计列表
+     * @return 转换后的统计列表
+     */
+    private List<QualificationStats> convertStatsToDisplayLevel(List<QualificationStats> statsList) {
+        if (statsList == null || statsList.isEmpty()) {
+            return statsList;
+        }
+
+        // 按新的分类（初级、中级、高级）重新分组统计
+        java.util.Map<String, QualificationStats> groupedStats = new java.util.HashMap<>();
+        int totalCount = statsList.stream().mapToInt(QualificationStats::getCount).sum();
+
+        for (QualificationStats stat : statsList) {
+            String displayLevel = convertToDisplayLevel(stat.getLevelName());
+
+            if (!groupedStats.containsKey(displayLevel)) {
+                QualificationStats newStat = new QualificationStats();
+                newStat.setLevelName(displayLevel);
+                newStat.setCount(stat.getCount());
+                newStat.setTotalCount(totalCount);
+                newStat.setPercentage(stat.getPercentage());
+                groupedStats.put(displayLevel, newStat);
+            } else {
+                // 合并相同等级的统计（如一级、二级、三级都合并为高级）
+                QualificationStats existing = groupedStats.get(displayLevel);
+                existing.setCount(existing.getCount() + stat.getCount());
+                // 重新计算百分比
+                existing.setPercentage(Math.round(existing.getCount() * 100.0 / totalCount * 100.0) / 100.0);
+            }
+        }
+
+        return new java.util.ArrayList<>(groupedStats.values());
+    }
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/resources/mapper/portrait/QualificationLevelIndicatorMapper.xml

@@ -20,13 +20,7 @@
 
     <!-- 查询个人资质等级 -->
     <select id="queryPersonalQualificationLevel" parameterType="Long" resultType="String">
-        SELECT
-            CASE
-                WHEN qualification_level = 'LEVEL_FIVE' THEN '初级'
-                WHEN qualification_level = 'LEVEL_FOUR' THEN '中级'
-                WHEN qualification_level IN ('LEVEL_ONE', 'LEVEL_TWO', 'LEVEL_THREE') THEN '高级'
-                ELSE NULL
-                END as qualification_level
+        SELECT qualification_level
         FROM sys_user
         WHERE user_id = #{userId}
     </select>
@@ -34,12 +28,7 @@
     <!-- 查询组织资质等级统计 -->
     <select id="queryOrgQualificationLevelStats" resultMap="QualificationStatsResult">
         SELECT
-        CASE
-        WHEN qualification_level = 'LEVEL_FIVE' THEN '初级'
-        WHEN qualification_level = 'LEVEL_FOUR' THEN '中级'
-        WHEN qualification_level IN ('LEVEL_ONE', 'LEVEL_TWO', 'LEVEL_THREE') THEN '高级'
-        ELSE '未知'
-        END as level_name,
+        qualification_level as level_name,
         COUNT(*) as count,
         (SELECT COUNT(*) FROM sys_user WHERE user_id in
         <include refid="userIdsCondition"/>
@@ -51,13 +40,7 @@
         <include refid="userIdsCondition"/>
         and del_flag='0' and status='0'
         AND qualification_level IS NOT NULL
-        GROUP BY
-        CASE
-        WHEN qualification_level = 'LEVEL_FIVE' THEN '初级'
-        WHEN qualification_level = 'LEVEL_FOUR' THEN '中级'
-        WHEN qualification_level IN ('LEVEL_ONE', 'LEVEL_TWO', 'LEVEL_THREE') THEN '高级'
-        ELSE '未知'
-        END
+        GROUP BY qualification_level
     </select>
 
 </mapper>