From 039a7a02f332f7dda2d11a66aaa47fd72e52afbe Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 22 Aug 2022 14:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcResiCollectVisitorDao.xml        | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
index 4ec0676f2c..35189406b9 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml
@@ -120,8 +120,33 @@
         UPDATED_TIME
         from ic_resi_collect_visitor
         where DEL_FLAG = '0'
-        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-            AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        AND CUSTOMER_ID = #{customerId}
+        <if test="idCard != null and idCard != ''">
+            AND ID_CARD = #{idCard}
+        </if>
+        <if test="name != null and name != ''">
+            AND NAME = #{name}
+        </if>
+        <if test="mobile != null and mobile != ''">
+            AND MOBILE = #{mobile}
+        </if>
+        <if test="villageId != null and villageId != ''">
+            AND VILLAGE_ID = #{villageId}
+        </if>
+        <if test="buildId != null and buildId != ''">
+            AND BUILD_ID = #{buildId}
+        </if>
+        <if test="unitId != null and unitId != ''">
+            AND UNIT_ID = #{unitId}
+        </if>
+        <if test="homeId != null and homeId != ''">
+            AND HOME_ID = #{homeId}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND CREATED_TIME >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND CREATED_TIME &lt;= #{endTime}
         </if>
         <if test='orgId != null and orgId != "" '>
             AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')