From bba1e004255ff24419f4bd82cd67acb3b3e77bba Mon Sep 17 00:00:00 2001
From: let5sne <let5sne@gmail.com>
Date: Thu, 9 Jul 2026 16:01:14 +0800
Subject: [PATCH] fix(aihr): align growth path progress with criteria

---
 .../aihr/service/AihrPracticeSeedService.java | 16 +++++++++--
 .../service/AihrPracticeSeedServiceTest.java  | 28 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrPracticeSeedService.java b/backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrPracticeSeedService.java
index 9180e5f4..6f07e153 100644
--- a/backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrPracticeSeedService.java
+++ b/backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrPracticeSeedService.java
@@ -856,12 +856,22 @@ public class AihrPracticeSeedService {
             );
         }
         return List.of(
-            new GrowthStageResponse("初级", Math.min(100, Math.max(30, completed * 10)), completed >= 3 ? "已达成" : "进行中", "完成3次基础场景并保持80分以上"),
-            new GrowthStageResponse("中级", Math.min(100, Math.max(0, completed * 6 + Math.max(0, score - 75))), completed >= 10 && score >= 85 ? "已达成" : "待积累", "完成10次训练且测评分达到85"),
-            new GrowthStageResponse("高级", Math.min(100, Math.max(0, completed * 4 + Math.max(0, score - 80))), completed >= 20 && score >= 90 ? "已达成" : "待积累", "完成20次训练、主管复盘稳定通过")
+            new GrowthStageResponse("初级", stageProgress(completed, 3, score, 80), stageStatus(completed, 3, score, 80, "进行中"), "完成3次基础场景并保持80分以上"),
+            new GrowthStageResponse("中级", stageProgress(completed, 10, score, 85), stageStatus(completed, 10, score, 85, "待积累"), "完成10次训练且测评分达到85"),
+            new GrowthStageResponse("高级", stageProgress(completed, 20, score, 90), stageStatus(completed, 20, score, 90, "待积累"), "完成20次训练、主管复盘稳定通过")
         );
     }
 
+    private int stageProgress(int completed, int requiredCompleted, int score, int requiredScore) {
+        int completedProgress = Math.min(100, Math.round(completed * 100F / requiredCompleted));
+        int scoreProgress = Math.min(100, Math.round(score * 100F / requiredScore));
+        return Math.min(completedProgress, scoreProgress);
+    }
+
+    private String stageStatus(int completed, int requiredCompleted, int score, int requiredScore, String fallback) {
+        return completed >= requiredCompleted && score >= requiredScore ? "已达成" : fallback;
+    }
+
     public List<PracticeAlertResponse> alerts() {
         ensurePracticeTable();
         int pending = countPendingReview("");
diff --git a/backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrPracticeSeedServiceTest.java b/backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrPracticeSeedServiceTest.java
index 1aee70b9..9f23ca44 100644
--- a/backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrPracticeSeedServiceTest.java
+++ b/backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrPracticeSeedServiceTest.java
@@ -136,6 +136,34 @@ public class AihrPracticeSeedServiceTest {
         assertTrue(profile.growthPath().stream().allMatch(item -> Integer.valueOf(0).equals(item.progress())));
     }
 
+    @Test
+    public void competencyGrowthProgressStopsAtWeakRequirement() {
+        JdbcTemplate jdbcTemplate = mock(JdbcTemplate.class);
+        when(jdbcTemplate.queryForObject(ArgumentMatchers.anyString(), eq(Integer.class), ArgumentMatchers.any(), ArgumentMatchers.any()))
+            .thenReturn(1);
+        when(jdbcTemplate.query(contains("COUNT(*) completed"), any(RowMapper.class), eq("000000"), eq("13900001001"), eq("13900001001")))
+            .thenAnswer(invocation -> mapOne(invocation, Map.of(
+                "completed", "33",
+                "score", "81",
+                "pending_review", "2",
+                "compliance", "82",
+                "communication", "80",
+                "emotion", "78",
+                "incentive_points", "20"
+            )));
+        AihrPracticeSeedService service = new AihrPracticeSeedService(new ObjectMapper(), jdbcTemplate, null, null);
+
+        CompetencyResponse profile = service.competency("13900001001");
+
+        assertEquals("初级", profile.aiLevel());
+        assertEquals(100, profile.growthPath().get(0).progress());
+        assertEquals("已达成", profile.growthPath().get(0).status());
+        assertEquals(95, profile.growthPath().get(1).progress());
+        assertEquals("待积累", profile.growthPath().get(1).status());
+        assertEquals(90, profile.growthPath().get(2).progress());
+        assertEquals("待积累", profile.growthPath().get(2).status());
+    }
+
     @SuppressWarnings({"unchecked", "rawtypes"})
     private static <T> List<T> mapOne(InvocationOnMock invocation, Map<String, String> values) throws SQLException {
         RowMapper mapper = invocation.getArgument(1);