diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java index cbccafa..9a31909 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java @@ -2233,6 +2233,9 @@ public class ExportInHandler implements BaseHandler { return ResultUtil.failure(ErrorType.PARAMS_ERROR.id(), "导入失败", errorDataList); } + // 模型去空格处理 + validData.stream().forEach(item -> item.setModels(StringUtils.trim(item.getModels()))); + // 首先按对船名,般次,提单进行分组 Map> collect = validData.stream() .collect(Collectors.groupingBy(item -> StringUtils.joinWith("#$#", item.getShipName(), item.getVoyage(), item.getBillNo(), item.getBrand(), item.getModels()), Collectors.toList()));