From d2264d73349d8f0cea3d6bde472548dde227c168 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 07 四月 2025 09:15:38 +0800
Subject: [PATCH] 查询货架条件加上状态
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
index f061cc7..00943f6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -432,9 +432,11 @@
}else {
List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
.between(InsOrderState::getCreateTime, start, end));
- for (InsOrderState insOrderState : insOrderStates) {
- IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(insOrderState.getId(), page);
- map.put(insOrderState.getLaboratory(), insOrderUserDtoIPage);
+ Map<String, List<InsOrderState>> listMap = insOrderStates.stream().collect(Collectors.groupingBy(InsOrderState::getLaboratory));
+ for (Map.Entry<String, List<InsOrderState>> entry : listMap.entrySet()) {
+ List<Integer> ids = entry.getValue().stream().map(InsOrderState::getId).collect(Collectors.toList());
+ IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(ids, new Page(1,9));
+ map.put(entry.getKey(), insOrderUserDtoIPage);
}
}
return map;
--
Gitblit v1.9.3