From 039720b74279fc93dd360e6796a163e125d44105 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 2 Nov 2022 09:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/PageTripReportFormDTO.java | 6 ++++++
 .../src/main/resources/mapper/IcTripReportRecordDao.xml     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
index 45f9152909..4c2e07b48d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java
@@ -54,4 +54,10 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
      * 查看详情时此列有值
      */
     private String id;
+
+    /**
+     * 7天内旅居史情况，字典表(sojourn_history)【磐石】
+     */
+    private String sojournHistory;
+
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index b3e00357ac..4a94d37ddc 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -62,6 +62,9 @@
             <if test='null != id and "" != id'>
                 AND r.id=#{id}
             </if>
+            <if test='null != sojournHistory and "" != sojournHistory'>
+                AND r.sojourn_history = #{sojournHistory}
+            </if>
         ORDER BY
             r.ARRIVE_DATE DESC
     </select>