From 9bf5504fbf736379f2767a9eb73e0e4ba523e99f Mon Sep 17 00:00:00 2001
From: dengjun <dengjun_83@163.com>
Date: Fri, 1 Mar 2024 14:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=A9=BA=E6=A0=BC=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/haitonggauto/rtosc/handler/ExportInHandler.java   | 3 +++
 1 file changed, 3 insertions(+)

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<String, List<ExportInExcel>> collect = validData.stream()
                 .collect(Collectors.groupingBy(item -> StringUtils.joinWith("#$#", item.getShipName(), item.getVoyage(), item.getBillNo(), item.getBrand(), item.getModels()), Collectors.toList()));