From fed0d22f45ea92471397fdc11e9be9ae59d0a99c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 21 Sep 2022 17:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/IcTripReportRecordDTO.java  |  3 +++
 .../mapper/IcTripReportRecordDao.xml          | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

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 508f8dc2ad..af101625d0 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
@@ -35,6 +35,9 @@ public class IcTripReportRecordDTO implements Serializable {
     @ExcelIgnore
     private String id;
 
+    @ExcelIgnore
+    private String epidemicId;
+
     /**
      * 居民端用户所在网格id,数字社区居民所属网格id
      */
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 15a413748b..34d7f40da1 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
@@ -26,35 +26,36 @@
     <select id="pageList" parameterType="com.epmet.dto.form.PageTripReportFormDTO" resultType="com.epmet.dto.IcTripReportRecordDTO">
         SELECT
             r.*,
+            a.ID AS epidemicId,
             r.CREATED_TIME AS reportTime
-        FROM
-            ic_trip_report_record r
+        FROM ic_trip_report_record r
+        LEFT JOIN ic_epidemic_special_attention a ON (a.ID_CARD = r.ID_CARD AND a.DEL_FLAG = 0 AND a.IS_ATTENTION = 1 AND a.ATTENTION_TYPE = 2)
         WHERE
             r.DEL_FLAG = '0'
             AND r.CUSTOMER_ID = #{customerId}
             <if test='null != agencyId and "" != agencyId'>
-                AND (AGENCY_ID = #{agencyId} OR pids like concat('%', #{agencyId}, '%'))
+                AND (r.AGENCY_ID = #{agencyId} OR r.pids like concat('%', #{agencyId}, '%'))
             </if>
             <if test='null != name and "" != name'>
-                AND NAME like concat('%',#{name},'%')
+                AND r.NAME like concat('%',#{name},'%')
             </if>
             <if test='null != mobile and "" != mobile'>
-                AND MOBILE like concat('%',#{mobile},'%')
+                AND r.MOBILE like concat('%',#{mobile},'%')
             </if>
             <if test='null != idCard and "" != idCard'>
-                AND ID_CARD like concat('%',#{idCard},'%')
+                AND r.ID_CARD like concat('%',#{idCard},'%')
             </if>
             <if test='null != sourceAddressCode and "" != sourceAddressCode'>
-                AND SOURCE_ADDRESS_CODE like concat(#{sourceAddressCode},'%')
+                AND r.SOURCE_ADDRESS_CODE like concat(#{sourceAddressCode},'%')
             </if>
             <if test='null != sourceAddress and "" != sourceAddress'>
-                AND SOURCE_ADDRESS like concat('%',#{sourceAddress},'%')
+                AND r.SOURCE_ADDRESS like concat('%',#{sourceAddress},'%')
             </if>
             <if test='null != startDate and "" != startDate'>
-                AND ARRIVE_DATE <![CDATA[ >= ]]> #{startDate}
+                AND r.ARRIVE_DATE <![CDATA[ >= ]]> #{startDate}
             </if>
             <if test='null != endDate and "" != endDate'>
-                AND ARRIVE_DATE <![CDATA[ <= ]]> #{endDate}
+                AND r.ARRIVE_DATE <![CDATA[ <= ]]> #{endDate}
             </if>
             <if test='null != id and "" != id'>
                 AND r.id=#{id}