Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-10-17 d5d652d23a0bdf64ce527a6b592713a849abac7d

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -321,12 +321,12 @@
                .eq(OptimizeHeatDetail::getProjectNo, current)
        );

        Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
        Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("layout_id").toString()));
//        List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
        List<List<Map<String, Object>>> result = new ArrayList<>();
        for (int i = 1; i <= groupBy.keySet().size(); i++) {
            String key = i + "";
            if (key != null) {
        List<List<Map<String, Object>>> result=new ArrayList<>();
        for (int i=1;i<=groupBy.keySet().size();i++) {
            String key=i+"";
            if(key!=null){
                result.add(groupBy.get(key));
            }
        }