From c7e9e0fa1132349c94afe3c57370a976e2206dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 8 May 2026 14:14:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(task):=20=E6=96=B0=E5=A2=9E=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改任务数量接口，新增已完成数量字段
- 扩展任务数量VO，增加completeCount属性
- 查询任务列表时包含所有状态，支持计算已完成数量
- 统计逻辑中增加对已完成任务的过滤和计数
- 接口文档注释更新，更准确描述返回内容
---
 .../controller/QmsIncomingInspectionTaskController.java     | 2 +-
 .../common/pojo/vo/QmsIncomingInspectionTaskCountVO.java    | 5 +++++
 .../service/impl/QmsIncomingInspectionTaskServiceImpl.java  | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java
index c19c8be4..2d19e1cf 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java
@@ -88,7 +88,7 @@ public class QmsIncomingInspectionTaskController extends BaseController {
     }
 
     /**
-     * 查询当前登录用户的任务数量（待检验数量、检验中数量、已延期数量）
+     * 查询当前登录用户的任务数量
      */
     @GetMapping("pad/count")
     public ApiResult<QmsIncomingInspectionTaskCountVO> count() {
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCountVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCountVO.java
index 9fa857bf..0059b2fd 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCountVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCountVO.java
@@ -22,4 +22,9 @@ public class QmsIncomingInspectionTaskCountVO {
      * 已延期数量（是否超期=true）
      */
     private long overdueCount;
+
+    /**
+     * 已完成数量（检验状态=2）
+     */
+    private long completeCount;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java
index d5b48878..1c23b1ac 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java
@@ -41,7 +41,6 @@ public class QmsIncomingInspectionTaskServiceImpl extends ServiceImpl<QmsIncomin
         List<QmsIncomingInspectionTask> list = lambdaQuery()
                 .select(QmsIncomingInspectionTask::getInspectionStatus, QmsIncomingInspectionTask::getIsOverdue)
                 .eq(QmsIncomingInspectionTask::getInspectorId, inspectorId)
-                .lt(QmsIncomingInspectionTask::getInspectionStatus, (short) 2)
                 .list();
 
         // 待检验数量（检验状态=0）
@@ -53,10 +52,15 @@ public class QmsIncomingInspectionTaskServiceImpl extends ServiceImpl<QmsIncomin
         // 已延期数量（是否超期=true）
         long overdueCount = list.stream().filter(QmsIncomingInspectionTask::getIsOverdue).count();
 
+        // 已完成数量（检验状态=2）
+        long completeCount = list.stream().filter(item -> item.getInspectionStatus() == 2).count();
+
         QmsIncomingInspectionTaskCountVO vo = new QmsIncomingInspectionTaskCountVO();
         vo.setPendingCount(pendingCount);
         vo.setInProgressCount(inProgressCount);
         vo.setOverdueCount(overdueCount);
+        vo.setCompleteCount(completeCount);
+
         return vo;
     }