From 9f4c3f2dfb361c9c043bc7d3f64a771f34734004 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 10 Nov 2022 10:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A3=90=E7=9F=B3=E6=98=AF=E5=90=A6=E8=90=BD?=
 =?UTF-8?q?=E5=9C=B0=E6=A3=80=E6=98=AF=E5=90=A6=E5=88=B0=E8=BE=BE=E6=9B=B9?=
 =?UTF-8?q?=E5=8E=BF=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/IcPsTripReportExcelImportListener.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java
index 06cea360b2..2715302612 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcPsTripReportExcelImportListener.java
@@ -84,31 +84,31 @@ public class IcPsTripReportExcelImportListener implements ReadListener<IcPsTripR
                 errMsg.append("‘48小时核酸检测’值填写错误;");
                 bl.set(true);
             }
-            if (!trafficTypeMap.containsKey(data.getTrafficType())) {
+            if (!trafficTypeMap.containsKey(e.getTrafficType())) {
                 errMsg.append("‘返回方式’值填写错误;");
                 bl.set(true);
             }
-            if ("其他".equals(data.getTrafficType()) && StringUtils.isBlank(data.getTrafficTypeExplain())) {
+            if ("其他".equals(e.getTrafficType()) && StringUtils.isBlank(e.getTrafficTypeExplain())) {
                 errMsg.append("返回方式为其他时，请补充‘其他返回方式’;");
                 bl.set(true);
             }
-            if (StringUtils.isNotBlank(data.getSojournHistory()) && !sojournHistoryMap.containsKey(data.getSojournHistory())) {
+            if (StringUtils.isNotBlank(e.getSojournHistory()) && !sojournHistoryMap.containsKey(e.getSojournHistory())) {
                 errMsg.append("‘7天内旅居史情况’值填写错误;");
                 bl.set(true);
             }
-            if (StringUtils.isNotBlank(data.getIsolateType()) && !isolateTypeMap.containsKey(data.getIsolateType())) {
+            if (StringUtils.isNotBlank(e.getIsolateType()) && !isolateTypeMap.containsKey(e.getIsolateType())) {
                 errMsg.append("‘隔离状态’值填写错误;");
                 bl.set(true);
             }
-            if (!"是".equals(e.getIsArriveCheck()) && !"否".equals(e.getIsArriveCheck())) {
+            if (StringUtils.isNotBlank(e.getIsArriveCheck()) && !"是".equals(e.getIsArriveCheck()) && !"否".equals(e.getIsArriveCheck())) {
                 errMsg.append("‘是否落实“落地检”’值填写错误;");
                 bl.set(true);
             }
-            if (!"是".equals(e.getIsArrive()) && !"否".equals(e.getIsArrive())) {
+            if (StringUtils.isNotBlank(e.getIsArrive()) && !"是".equals(e.getIsArrive()) && !"否".equals(e.getIsArrive())) {
                 errMsg.append("‘是否达到曹县’值填写错误;");
                 bl.set(true);
             }
-            if (StringUtils.isNotBlank(data.getTripDataType()) && !tripDataTypeMap.containsKey(data.getTripDataType())) {
+            if (StringUtils.isNotBlank(e.getTripDataType()) && !tripDataTypeMap.containsKey(e.getTripDataType())) {
                 errMsg.append("‘类型（省内、省外、市内、县内）’值填写错误;");
                 bl.set(true);
             }