From 400038da9798ee772248b76c13da17f911f848fe Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 30 Mar 2022 15:48:25 +0800
Subject: [PATCH] SOURCE_ADDRESS

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

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 b5c4aa2462..af23243c03 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
@@ -28,7 +28,10 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable {
      * 来源地区编码
      */
     private String sourceAddressCode;
-
+    /**
+     * 来源地区名称
+     */
+    private String sourceAddress;
     /**
      * 来到本地时间
      */
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 0e55cceb05..f667e9826d 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
@@ -47,6 +47,9 @@
             <if test='null != sourceAddressCode and "" != sourceAddressCode'>
                 AND SOURCE_ADDRESS_CODE like concat(#{sourceAddressCode},'%')
             </if>
+            <if test='null != sourceAddress and "" != sourceAddress'>
+                AND SOURCE_ADDRESS like concat('%',#{sourceAddress},'%')
+            </if>
             <if test='null != startDate and "" != startDate'>
                 AND ARRIVE_DATE <![CDATA[ >= ]]> #{startDate}
             </if>