From 8f00871b6d82b2893b68e1d64dace8cd16d5120b Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Fri, 16 Jan 2026 21:23:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2=E6=A0=B8=E5=BF=83=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=88=86=E7=A6=BB=E5=BE=85?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=92=8C=E8=BF=9B=E8=A1=8C=E4=B8=AD=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/designhub/service/AnalyticsService.java     | 9 ++++++++-
 .../main/java/com/designhub/vo/DemandStatisticsVO.java   | 3 ++-
 frontend/src/views/Analytics.vue                         | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/com/designhub/service/AnalyticsService.java b/backend/src/main/java/com/designhub/service/AnalyticsService.java
index 777ca6e..2f1879d 100644
--- a/backend/src/main/java/com/designhub/service/AnalyticsService.java
+++ b/backend/src/main/java/com/designhub/service/AnalyticsService.java
@@ -379,8 +379,14 @@ public class AnalyticsService {
             .filter(t -> "completed".equals(t.getStatus()))
             .count();
         
+        // 待处理：只包含 pending 状态（不包含 in_progress）
         int pendingDemands = (int) tasks.stream()
-            .filter(t -> Arrays.asList("pending", "in_progress", "submitted").contains(t.getStatus()))
+            .filter(t -> "pending".equals(t.getStatus()))
+            .count();
+        
+        // 进行中：只包含 in_progress 状态
+        int inProgressDemands = (int) tasks.stream()
+            .filter(t -> "in_progress".equals(t.getStatus()))
             .count();
         
         int canceledDemands = (int) tasks.stream()
@@ -423,6 +429,7 @@ public class AnalyticsService {
             .monthDemands(monthDemands)
             .completedDemands(completedDemands)
             .pendingDemands(pendingDemands)
+            .inProgressDemands(inProgressDemands)
             .canceledDemands(canceledDemands)
             .totalScoreUsed(totalScoreUsed)
             .todayScoreUsed(todayScoreUsed)
diff --git a/backend/src/main/java/com/designhub/vo/DemandStatisticsVO.java b/backend/src/main/java/com/designhub/vo/DemandStatisticsVO.java
index 2a4d5c9..1614451 100644
--- a/backend/src/main/java/com/designhub/vo/DemandStatisticsVO.java
+++ b/backend/src/main/java/com/designhub/vo/DemandStatisticsVO.java
@@ -129,7 +129,8 @@ public class DemandStatisticsVO {
         private Integer weekDemands;           // 本周需求数
         private Integer monthDemands;          // 本月需求数
         private Integer completedDemands;      // 已完成数
-        private Integer pendingDemands;        // 进行中数
+        private Integer pendingDemands;        // 待处理数（pending状态）
+        private Integer inProgressDemands;     // 进行中数（in_progress状态）
         private Integer canceledDemands;       // 已取消数
         private BigDecimal totalScoreUsed;     // 总积分消耗
         private BigDecimal todayScoreUsed;     // 今日积分消耗
diff --git a/frontend/src/views/Analytics.vue b/frontend/src/views/Analytics.vue
index fb71dc0..c9998fc 100644
--- a/frontend/src/views/Analytics.vue
+++ b/frontend/src/views/Analytics.vue
@@ -707,6 +707,7 @@ const statistics = reactive<DemandStatistics>({
     monthDemands: 0,
     completedDemands: 0,
     pendingDemands: 0,
+    inProgressDemands: 0,
     canceledDemands: 0,
     totalScoreUsed: 0,
     todayScoreUsed: 0,
@@ -812,8 +813,9 @@ const stageChartRef = ref<HTMLElement>()
 // 计算属性
 const overview = computed(() => statistics.overview)
 
+// 进行中任务数：直接使用后端返回的 inProgressDemands
 const inProgressCount = computed(() => {
-  return overview.value.totalDemands - overview.value.completedDemands - overview.value.pendingDemands - overview.value.canceledDemands
+  return overview.value.inProgressDemands || 0
 })
 
 const completionRate = computed(() => {