原始记录查询注释定尺明细逻辑

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -1192,63 +1192,63 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			}
 
 			// 按length字段分组，并统计每组的总数和总重
-			Map<Integer, Map<String, Object>> lengthResultMap = billetBasicInfoList.stream()
-					.filter(info -> info.getLength() != null) // 过滤掉length为null的记录
-					.collect(Collectors.groupingBy(
-							BilletBasicInfo::getLength, // 按length分组
-							Collectors.collectingAndThen(
-									Collectors.toList(),
-									list -> {
-										// 计算每组的总重（保留4位小数）
-										double totalWeight = list.stream()
-												.mapToDouble(BilletBasicInfo::getBilletWeight)
-												.sum();
-										totalWeight = Math.round(totalWeight * 10000) / 10000.0;
-										// 统计每组的总数
-										int totalCount = list.size();
-										// 创建每组的结果Map
-										Map<String, Object> groupResult = new HashMap<>();
-										groupResult.put("lengthTotalWeight", totalWeight);
-										groupResult.put("lengthTotalCount", totalCount);
-										//棒一统计
-										long rollClubOneCount = list.stream()
-												.filter(billet -> "roll_club_one".equals(billet.getBelongTable()))
-												.count();
-										groupResult.put("rollClubOneCount", (int) rollClubOneCount);
-										// 棒二统计
-										long rollClubTwoCount = list.stream()
-												.filter(billet -> "roll_club_two".equals(billet.getBelongTable()))
-												.count();
-										groupResult.put("rollClubTwoCount", (int) rollClubTwoCount);
-										// 棒三统计
-										long rollClubThreeCount = list.stream()
-												.filter(billet -> "roll_club_three".equals(billet.getBelongTable()))
-												.count();
-										groupResult.put("rollClubThreeCount", (int) rollClubThreeCount);
-										// 高线统计
-										long rollHeightCount = list.stream()
-												.filter(billet -> "roll_height".equals(billet.getBelongTable()))
-												.count();
-										groupResult.put("rollHeightCount", (int) rollHeightCount);
-										// 堆垛统计
-										long stackingAndLoadingVehiclesCount = list.stream()
-												.filter(billet -> "stacking_and_loading_vehicles".equals(billet.getBelongTable()))
-												.count();
-										groupResult.put("stackingAndLoadingVehiclesCount", (int) stackingAndLoadingVehiclesCount);
-										return groupResult;
-									}
-							)
-					));
-			// 将Integer键转换为String键
-			Map<String, Map<String, Object>> stringKeyMap = lengthResultMap.entrySet().stream()
-					.collect(Collectors.toMap(
-							e -> String.valueOf(e.getKey()),
-							Map.Entry::getValue
-					));
-
-			// 转换为JSON字符串
-			String jsonResult = JSON.toJSONString(stringKeyMap);
-			heatsActualsInfo.setLength(jsonResult);
+//			Map<Integer, Map<String, Object>> lengthResultMap = billetBasicInfoList.stream()
+//					.filter(info -> info.getLength() != null) // 过滤掉length为null的记录
+//					.collect(Collectors.groupingBy(
+//							BilletBasicInfo::getLength, // 按length分组
+//							Collectors.collectingAndThen(
+//									Collectors.toList(),
+//									list -> {
+//										// 计算每组的总重（保留4位小数）
+//										double totalWeight = list.stream()
+//												.mapToDouble(BilletBasicInfo::getBilletWeight)
+//												.sum();
+//										totalWeight = Math.round(totalWeight * 10000) / 10000.0;
+//										// 统计每组的总数
+//										int totalCount = list.size();
+//										// 创建每组的结果Map
+//										Map<String, Object> groupResult = new HashMap<>();
+//										groupResult.put("lengthTotalWeight", totalWeight);
+//										groupResult.put("lengthTotalCount", totalCount);
+//										//棒一统计
+//										long rollClubOneCount = list.stream()
+//												.filter(billet -> "roll_club_one".equals(billet.getBelongTable()))
+//												.count();
+//										groupResult.put("rollClubOneCount", (int) rollClubOneCount);
+//										// 棒二统计
+//										long rollClubTwoCount = list.stream()
+//												.filter(billet -> "roll_club_two".equals(billet.getBelongTable()))
+//												.count();
+//										groupResult.put("rollClubTwoCount", (int) rollClubTwoCount);
+//										// 棒三统计
+//										long rollClubThreeCount = list.stream()
+//												.filter(billet -> "roll_club_three".equals(billet.getBelongTable()))
+//												.count();
+//										groupResult.put("rollClubThreeCount", (int) rollClubThreeCount);
+//										// 高线统计
+//										long rollHeightCount = list.stream()
+//												.filter(billet -> "roll_height".equals(billet.getBelongTable()))
+//												.count();
+//										groupResult.put("rollHeightCount", (int) rollHeightCount);
+//										// 堆垛统计
+//										long stackingAndLoadingVehiclesCount = list.stream()
+//												.filter(billet -> "stacking_and_loading_vehicles".equals(billet.getBelongTable()))
+//												.count();
+//										groupResult.put("stackingAndLoadingVehiclesCount", (int) stackingAndLoadingVehiclesCount);
+//										return groupResult;
+//									}
+//							)
+//					));
+//			// 将Integer键转换为String键
+//			Map<String, Map<String, Object>> stringKeyMap = lengthResultMap.entrySet().stream()
+//					.collect(Collectors.toMap(
+//							e -> String.valueOf(e.getKey()),
+//							Map.Entry::getValue
+//					));
+//
+//			// 转换为JSON字符串
+//			String jsonResult = JSON.toJSONString(stringKeyMap);
+//			heatsActualsInfo.setLength(jsonResult);
 
 			// 统计总数
 			long totalCount = billetBasicInfoList.size();