From 84861a2d7248c6d29a7e1d088350bdaa4abfca82 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 9 Nov 2022 14:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E8=A1=8C=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E9=A5=BC=E5=9B=BE=E4=BF=AE=E6=94=B9=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/EmphasisTripListFormDTO.java  | 1 +
 .../com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java  | 1 +
 .../src/main/resources/mapper/IcTripReportRecordDao.xml   | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java
index 3539affe85..5f338be962 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripListFormDTO.java
@@ -14,6 +14,7 @@ public class EmphasisTripListFormDTO extends PageFormDTO implements Serializable
     private static final long serialVersionUID = 5850717233738956442L;
 
     private String code;
+    private String name;
 
     private String dangerLevel;
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java
index 96a5ed7399..a6bc94b2ed 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java
@@ -17,6 +17,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable {
 
 //    @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class})
     private String code;
+    private String name;
 
     private String customerId;
 
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 490810a020..b9f942b776 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
@@ -98,8 +98,8 @@
           <if test='null != agencyId and agencyId != "" '>
               AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
           </if>
-          <if test='null != code and code != "" '>
-              AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%')
+          <if test='null != name and name != "" '>
+              AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%')
           </if>
           <choose>
               <when test='null != dangerLevel and dangerLevel != "" '>
@@ -120,8 +120,8 @@
         FROM ic_trip_report_record
         WHERE DEL_FLAG = '0'
         AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{agencyId},'%')
-        <if test='null != code and code != "" '>
-            AND SOURCE_ADDRESS_PATH_CODE LIKE CONCAT('%',#{code},'%')
+        <if test='null != name and name != "" '>
+            AND SOURCE_ADDRESS LIKE CONCAT('%',#{name},'%')
         </if>
         AND sojourn_history != '3'
         group by dangerLevel