From ae2a52a69dd83930c7c91a16b0c521c6349ccaf3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 09:57:58 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index fd28610..acf0dff 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -142,7 +142,7 @@
List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
- .selectAs(OptimizeLayout::getWidth, "olHeight")
+ .selectAs(OptimizeLayout::getHeight, "olHeight")
.leftJoin(OptimizeLayout.class, on -> on
.eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
.eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
@@ -183,14 +183,14 @@
* @return
*/
@Override
- public List<Map<String, Object>> selectCurrentCutTerritory(String current) {
- //鏈�缁堣繑鍥炵粨鏋�
+ public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+ //缁撴灉
List<Map<String, Object>> ResultcutTerritorys=new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
- .selectAs(OptimizeLayout::getWidth, "olHeight")
+ .selectAs(OptimizeLayout::getHeight, "olHeight")
.leftJoin(OptimizeLayout.class, on -> on
.eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
.eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
@@ -202,7 +202,6 @@
.eq(EdgStorageCageDetails::getEngineerId,current)
.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
-
for (Map<String, Object> cutTerritory : cutTerritorys) {
// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
@@ -215,7 +214,9 @@
}
ResultcutTerritorys.add(cutTerritory);
}
- return ResultcutTerritorys;
+ Map<String, List<Map<String, Object>>> groupBy=ResultcutTerritorys.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
+// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
+ return new ArrayList<>(groupBy.values());
//Sql鐗堟湰
// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
// .select("ol.width as olwidth","ol.height as olheight")
--
Gitblit v1.8.0