feat(task): 新增已完成任务数量统计功能

- 修改任务数量接口,新增已完成数量字段
- 扩展任务数量VO,增加completeCount属性
- 查询任务列表时包含所有状态,支持计算已完成数量
- 统计逻辑中增加对已完成任务的过滤和计数
- 接口文档注释更新,更准确描述返回内容
This commit is contained in:
曹鹏飞 2026-05-08 14:14:22 +08:00
parent 858726758d
commit c7e9e0fa11
3 changed files with 11 additions and 2 deletions

View File

@ -88,7 +88,7 @@ public class QmsIncomingInspectionTaskController extends BaseController {
} }
/** /**
* 查询当前登录用户的任务数量待检验数量检验中数量已延期数量 * 查询当前登录用户的任务数量
*/ */
@GetMapping("pad/count") @GetMapping("pad/count")
public ApiResult<QmsIncomingInspectionTaskCountVO> count() { public ApiResult<QmsIncomingInspectionTaskCountVO> count() {

View File

@ -22,4 +22,9 @@ public class QmsIncomingInspectionTaskCountVO {
* 已延期数量是否超期=true * 已延期数量是否超期=true
*/ */
private long overdueCount; private long overdueCount;
/**
* 已完成数量检验状态=2
*/
private long completeCount;
} }

View File

@ -41,7 +41,6 @@ public class QmsIncomingInspectionTaskServiceImpl extends ServiceImpl<QmsIncomin
List<QmsIncomingInspectionTask> list = lambdaQuery() List<QmsIncomingInspectionTask> list = lambdaQuery()
.select(QmsIncomingInspectionTask::getInspectionStatus, QmsIncomingInspectionTask::getIsOverdue) .select(QmsIncomingInspectionTask::getInspectionStatus, QmsIncomingInspectionTask::getIsOverdue)
.eq(QmsIncomingInspectionTask::getInspectorId, inspectorId) .eq(QmsIncomingInspectionTask::getInspectorId, inspectorId)
.lt(QmsIncomingInspectionTask::getInspectionStatus, (short) 2)
.list(); .list();
// 待检验数量检验状态=0 // 待检验数量检验状态=0
@ -53,10 +52,15 @@ public class QmsIncomingInspectionTaskServiceImpl extends ServiceImpl<QmsIncomin
// 已延期数量是否超期=true // 已延期数量是否超期=true
long overdueCount = list.stream().filter(QmsIncomingInspectionTask::getIsOverdue).count(); long overdueCount = list.stream().filter(QmsIncomingInspectionTask::getIsOverdue).count();
// 已完成数量检验状态=2
long completeCount = list.stream().filter(item -> item.getInspectionStatus() == 2).count();
QmsIncomingInspectionTaskCountVO vo = new QmsIncomingInspectionTaskCountVO(); QmsIncomingInspectionTaskCountVO vo = new QmsIncomingInspectionTaskCountVO();
vo.setPendingCount(pendingCount); vo.setPendingCount(pendingCount);
vo.setInProgressCount(inProgressCount); vo.setInProgressCount(inProgressCount);
vo.setOverdueCount(overdueCount); vo.setOverdueCount(overdueCount);
vo.setCompleteCount(completeCount);
return vo; return vo;
} }