From f1916b183ebcff81c64bccae502a63b097c304f5 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期日, 18 八月 2024 12:42:16 +0800 Subject: [PATCH] 钢化界面添加显示人工拿走的玻璃信息 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java index de91e91..c65abed 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java @@ -128,11 +128,11 @@ wrapper.eq(DownGlassInfo::getWorkStationId, request.getWorkStationId()); } List<DownGlassInfo> downGlassInfos = downGlassInfoService.list(wrapper); - Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId)); +// Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId)); List<Object> engineerIdListTemp = downGlassInfoService.listObjs(new QueryWrapper<DownGlassInfo>().select("distinct engineer_id")); List<String> engineerIdList = engineerIdListTemp.stream().map(String::valueOf).collect(Collectors.toList()); JSONObject jsonObject4 = new JSONObject(); - jsonObject4.append("downGlassInfos", listMap); + jsonObject4.append("downGlassInfos", downGlassInfos); jsonObject4.append("engineerIdList", engineerIdList); //閽㈠寲寮�鍏� -- Gitblit v1.8.0