From cc288c374c482669003cf0c0d194643a19f1e702 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 1 Nov 2022 15:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=AF=A8=E5=AD=90=E7=89=88=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/data/IcTripReportExcelData.java     | 23 +++++++++++++++++--
 .../IcTripReportExcelImportListener.java      |  1 +
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java
index f6f2a86e42..af4c6aae75 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcTripReportExcelData.java
@@ -31,18 +31,37 @@ public class IcTripReportExcelData {
     @ExcelProperty("现居地（格式：省-市-区-街道-社区）")
     private String presentAddress;
 
-    @NotBlank(message = "详细地址为必填项")
-    @ExcelProperty("详细地址")
+    @NotBlank(message = "现居地详细地址为必填项")
+    @ExcelProperty("现居地详细地址")
     private String detailAddress;
 
     @NotBlank(message = "来自地区为必填项")
     @ExcelProperty("来自地区（格式：省-市-区-街道-社区）")
     private String sourceAddress;
 
+    @NotBlank(message = "来自地区详细地址为必填项")
+    @ExcelProperty("来自地区详细地址")
+    private String sourceDetailAddress;
+
     @NotNull(message = "来到本地时间为必填项")
     @ExcelProperty("来到本地时间（格式：2022-01-01）")
     private Date arriveDate;
 
+    @ExcelProperty("返回方式")
+    @NotBlank(message = "不能为空")
+    private String trafficType;
+
+    @ExcelProperty("其他返回方式")
+    private String trafficTypeExplain;
+
+    @NotBlank(message = "48小时核酸检测为必填项")
+    @ExcelProperty("48小时核酸检测")
+    private String isNatRecord;
+
+    @NotBlank(message = "疫苗接种针次为必填项")
+    @ExcelProperty("疫苗接种针次")
+    private String vaccineNum;
+
     @ExcelProperty("离开本地时间（格式：2022-01-01）")
     private Date leaveDate;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java
index 2831eb532c..a9e1a102d7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java
@@ -64,6 +64,7 @@ public class IcTripReportExcelImportListener implements ReadListener<IcTripRepor
             tripReportRecordEntity.setAgencyId(staffInfo.getAgencyId());
             tripReportRecordEntity.setPids(staffInfo.getAgencyPIds());
             tripReportRecordEntity.setUserType(IcResiUserConstant.USER_TYPE_IMPORT);
+            tripReportRecordEntity.setIsNatRecord("是".equals(data.getIsNatRecord()) ? "1" : "0");
             datas.add(tripReportRecordEntity);
 
             if (datas.size() == MAX_THRESHOLD) {