rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
funny 2026-05-08 15:18:32 +08:00
parent 6c6f881812 c7e9e0fa11
commit fdc95c5797
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIncomingInspectionTaskController.java
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() {

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskCountVO.java
View File

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

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskServiceImpl.java
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;
} }