From c62fb6c8d67560b08ce72d385f03bc2be173422a Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Mon, 31 Oct 2022 17:32:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=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

---
 .../com/epmet/dto/IcTripReportRecordDTO.java  | 57 +++++++++++++++++++
 .../entity/IcTripReportRecordEntity.java      | 57 +++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
index 9d2ab97099..545019565c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
@@ -233,4 +233,61 @@ public class IcTripReportRecordDTO implements Serializable {
     @ColumnWidth(25)
     @ExcelProperty("核算检测关注名单")
     private String heSuanCheckDesc;
+
+    /**
+     * 交通方式，来源字典表(traffic_type)
+     */
+    private String trafficType;
+    /**
+     * 其他返回方式，交通方式为其他时此列需要有值
+     */
+    private String trafficTypeExplain;
+    /**
+     * 来源地详细信息 source_address字段的说明
+     */
+    private String sourceDetailAddress;
+    /**
+     * 疫苗接种针次 (1针 2针 3针)【小寨子】
+     */
+    private String vaccineNum;
+    /**
+     * 是否有48小时核算记录 0:否 1:是 【小寨子】
+     */
+    private String isNatRecord;
+    /**
+     * 年龄【磐石】
+     */
+    private String age;
+    /**
+     * 来曹事由【磐石】
+     */
+    private String describe;
+    /**
+     * 48小时核算检查结果(阴性 阳性)【磐石】
+     */
+    private String natOutcome;
+    /**
+     * 7天内旅居史情况，字典表(sojourn_history)【磐石】
+     */
+    private String sojournHistory;
+    /**
+     * 隔离状态，字典表(isolate_type)【磐石】
+     */
+    private String isolateType;
+    /**
+     * 是否落实"落地检" 0:否 1:是【磐石】
+     */
+    private String isArriveCheck;
+    /**
+     * 上报时间【磐石】
+     */
+    private Date reportingTime;
+    /**
+     * 管控措施【磐石】
+     */
+    private String controlMeasures;
+    /**
+     * 行程记录类型，字典表(trip_data_type)【磐石】
+     */
+    private String tripDataType;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
index 7182332216..3791178961 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
@@ -115,4 +115,61 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity {
      */
 	private String remark;
 
+    /**
+     * 交通方式，来源字典表(traffic_type)
+     */
+	private String trafficType;
+    /**
+     * 其他返回方式，交通方式为其他时此列需要有值
+     */
+	private String trafficTypeExplain;
+    /**
+     * 来源地详细信息 source_address字段的说明
+     */
+	private String sourceDetailAddress;
+    /**
+     * 疫苗接种针次 (1针 2针 3针)【小寨子】
+     */
+	private String vaccineNum;
+    /**
+     * 是否有48小时核算记录 0:否 1:是 【小寨子】
+     */
+	private String isNatRecord;
+	/**
+     * 年龄【磐石】
+     */
+	private String age;
+    /**
+     * 来曹事由【磐石】
+     */
+	private String describe;
+    /**
+     * 48小时核算检查结果(阴性 阳性)【磐石】
+     */
+	private String natOutcome;
+    /**
+     * 7天内旅居史情况，字典表(sojourn_history)【磐石】
+     */
+	private String sojournHistory;
+    /**
+     * 隔离状态，字典表(isolate_type)【磐石】
+     */
+	private String isolateType;
+    /**
+     * 是否落实"落地检" 0:否 1:是【磐石】
+     */
+	private String isArriveCheck;
+    /**
+     * 上报时间【磐石】
+     */
+	private Date reportingTime;
+    /**
+     * 管控措施【磐石】
+     */
+	private String controlMeasures;
+    /**
+     * 行程记录类型，字典表(trip_data_type)【磐石】
+     */
+	private String tripDataType;
+
 }