From 65c24955a122028dadd2b7d1b569cb830642ace2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 15 Sep 2021 15:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/epidemic/PersonTestingDao.xml      | 12 +++++++
 .../mapper/epidemic/EpidemicUserInfoDao.xml   | 12 +++++++
 .../mapper/vim/VaccinationInfoDao.xml         | 35 ++++++-------------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
index 52bb6fa..a05f0c9 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
@@ -68,6 +68,18 @@
         <if test="mobile != null and mobile != ''">
             AND t.mobile like '%${mobile}%'
         </if>
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},t.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},t.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},t.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},t.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            and (t.grid_id = #{gridId}
+            OR find_in_set(#{gridId},t.ALL_DEPT_IDS))
+        </if>
         order by t.CREATED_TIME desc
     </select>
     <select id="getMobileByIdCard" resultType="java.lang.String">
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index 11e4ce4..7c7ed70 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -152,6 +152,18 @@
         <if test="userName!=null and userName!=''">
             and ui.USER_NAME like '%${userName}%'
         </if>
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},hi.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},hi.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},hi.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},hi.ALL_DEPT_IDS))
+        </if>
+        <if test="gridId != '' and gridId != null">
+            and (hi.grid_id = #{gridId}
+            OR find_in_set(#{gridId},hi.ALL_DEPT_IDS))
+        </if>
         <if test="deptIdList != null">
             and hi.grid_id in
             <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
index 504c0b4..8e28e1a 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
@@ -52,7 +52,7 @@
             AND u.DEL_FLAG = '0'
             AND v.DOSE = u.VACCINATION_NUM
             AND u.VACCINATION_STATE = 1
-            AND datediff(NOW(), v.VACCINATION_TIME) >= #{vaccTime}
+            AND datediff(NOW(), DATE_FORMAT(v.VACCINATION_TIME,'%Y-%m-%d %H:%i:%s')) >= #{vaccTime}
         </if>
         <if test="vaccNo != null and vaccNo != '' and vaccNo != 0">
             AND v.DOSE = #{vaccNo}
@@ -60,32 +60,17 @@
         <if test="dose != null and dose != '' and dose > 0">
             AND v.DOSE = #{dose}
         </if>
-        <if test="street != null and street != ''">
-            and v.STREET like '%${street}%'
+        <if test="streetId != '' and streetId != null">
+            AND (find_in_set(#{streetId},v.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},v.ALL_DEPT_IDS))
         </if>
-        <if test="community != null and community != ''">
-            and v.COMMUNITY like '%${community}%'
+        <if test="communityId != '' and communityId != null">
+            AND (find_in_set(#{communityId},v.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},v.ALL_DEPT_IDS))
         </if>
-        <if test="gridName != null and gridName != ''">
-            and v.GRID like '%${gridName}%'
-        </if>
-        <if test="streetKeywords != null">
-            AND v.STREET IN
-            <foreach collection="streetKeywords" index="index" item="street" open="(" separator="," close=")">
-                #{street}
-            </foreach>
-        </if>
-        <if test="communityKeywords != null">
-            AND v.COMMUNITY IN
-            <foreach collection="communityKeywords" index="index" item="community" open="(" separator="," close=")">
-                #{community}
-            </foreach>
-        </if>
-        <if test="gridKeywords != null">
-            AND v.GRID_NAME IN
-            <foreach collection="gridKeywords" index="index" item="grid" open="(" separator="," close=")">
-                #{grid}
-            </foreach>
+        <if test="gridId != '' and gridId != null">
+            and (v.grid_id = #{gridId}
+            OR find_in_set(#{gridId},v.ALL_DEPT_IDS))
         </if>
         <if test="deptIdList != null">
             and v.grid_id in