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 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 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 item.getInspectionStatus() == 2).count(); + QmsIncomingInspectionTaskCountVO vo = new QmsIncomingInspectionTaskCountVO(); vo.setPendingCount(pendingCount); vo.setInProgressCount(inProgressCount); vo.setOverdueCount(overdueCount); + vo.setCompleteCount(completeCount); + return vo; }