2022年12月15日11:13:06

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -204,7 +204,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
 			for (String boxType_ : boxType) {
 				List<RepairItem> boxTypeSize = repairItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize).append(",");
+					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 				}
 			}
 			repair.setBoxTypeNumber(boxTypeNumber.toString());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -136,18 +136,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					.eq(TradingBoxFees::getPid, details.getId());
 				int count = tradingBoxFeesMapper.selectCount(tradingBoxFeesLambdaQueryWrapper);
 				tradingBoxItem.setCount(count);
-				/*//获取明细图片
-				LambdaQueryWrapper<TradingBoxFiles> tradingBoxFilesLambdaQueryWrapper = new LambdaQueryWrapper<>();
-				tradingBoxFilesLambdaQueryWrapper.eq(TradingBoxFiles::getIsDeleted, 0)
-					.eq(TradingBoxFiles::getTenantId, AuthUtil.getTenantId())
-					.eq(TradingBoxFiles::getType, "2")
-					.eq(TradingBoxFiles::getPid, tradingBoxItem.getId());
-				List<TradingBoxFiles> tradingBoxFilesList = tradingBoxFilesMapper.selectList(tradingBoxFilesLambdaQueryWrapper);
-				for (TradingBoxFiles tradingBoxFiles : tradingBoxFilesList) {
-					tradingBoxFiles.setLabel(tradingBoxFiles.getFileName());
-					tradingBoxFiles.setValue(tradingBoxFiles.getUrl());
-				}
-				tradingBoxItem.setTradingBoxFilesList(tradingBoxFilesList);*/
 			}
 			details.setTradingBoxItemsList(tradingBoxItemList);
 
@@ -218,7 +206,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			for (String boxType_ : boxType) {
 				List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize).append(",");
+					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 				}
 			}
 			tradingBox.setBoxTypeNumber(boxTypeNumber.toString());
@@ -442,7 +430,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			for (String boxType_ : boxType) {
 				List<TradingBoxItem> boxTypeSize = tradingBoxItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize).append(",");
+					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 				}
 			}
 			tradingBox.setBoxTypeNumber(boxTypeNumber.toString());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -198,7 +198,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			for (String boxType_ : boxType) {
 				List<TransportItem> boxTypeSize = transportItemList.stream().filter(e -> e.getBoxType().equals(boxType_)).collect(Collectors.toList());
 				if (ObjectUtils.isNotNull(boxTypeSize) && boxTypeSize.size() > 0) {
-					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize).append(",");
+					boxTypeNumber.append(boxType_).append("✖").append(boxTypeSize.size()).append(",");
 				}
 			}
 			transport.setBoxTypeNumber(boxTypeNumber.toString());