From 1a1b961c6cd39dfd7dce921119033a3d8c873aaa Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 25 Jul 2022 15:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=A1=E6=A0=B8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EpidemicUserInfoAuditController.java      |  6 ++--
 .../dao/EpidemicUserInfoAuditDao.java         |  5 +++-
 .../service/EpidemicUserInfoAuditService.java |  4 ++-
 .../EpidemicUserInfoAuditServiceImpl.java     |  9 +++++-
 .../epidemic/EpidemicUserInfoAuditDao.xml     | 28 ++++++++++++++++++-
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
index f6f3049..ec11167 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
@@ -43,13 +43,13 @@ import java.util.Map;
 @RestController
 @RequestMapping("epidemicuserinfoaudit")
 public class EpidemicUserInfoAuditController {
-    
+
     @Autowired
     private EpidemicUserInfoAuditService epidemicUserInfoAuditService;
 
     @GetMapping("page")
     public Result<PageData<EpidemicUserInfoAuditDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<EpidemicUserInfoAuditDTO> page = epidemicUserInfoAuditService.page(params);
+        PageData<EpidemicUserInfoAuditDTO> page = epidemicUserInfoAuditService.getPageList(params);
         return new Result<PageData<EpidemicUserInfoAuditDTO>>().ok(page);
     }
 
@@ -91,4 +91,4 @@ public class EpidemicUserInfoAuditController {
         return new Result();
     }
 
-}
\ No newline at end of file
+}
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java
index 2e54303..82f49f3 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java
@@ -25,6 +25,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 疫情防控信息表
@@ -55,4 +56,6 @@ public interface EpidemicUserInfoAuditDao extends BaseDao<EpidemicUserInfoAuditE
      * @date 2022/6/30 14:12
      */
     List<FamilyMemberInfoResultDTO> listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List<String> existIdCard);
-}
\ No newline at end of file
+
+    List<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params);
+}
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
index 57e4767..8f43b11 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
@@ -126,4 +126,6 @@ public interface EpidemicUserInfoAuditService extends BaseService<EpidemicUserIn
      * @date 2022-06-29
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+
+    PageData<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params);
+}
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
index 36c1386..7037a67 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
@@ -163,4 +163,11 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl<EpidemicUs
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+    @Override
+    public PageData<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params) {
+        IPage<EpidemicUserInfoAuditDTO> page = getPage(params);
+        List<EpidemicUserInfoAuditDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+}
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml
index 6f88f27..4249491 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml
@@ -75,4 +75,30 @@
             </foreach>
         </if>
     </select>
-</mapper>
\ No newline at end of file
+    <select id="getPageList" resultType="com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO">
+        select * from epidemic_user_info_audit
+        WHERE
+            DEL_FLAG = '0'
+            <if test="userName != '' and userName != null">
+                AND USER_NAME like '%${userName}%'
+            </if>
+            <if test="idCard != '' and idCard != null">
+                AND ID_CARD like '%${idCard}%'
+            </if>
+            <if test="auditState != '' and auditState != null">
+                AND AUDIT_STATE = #{auditState}
+            </if>
+            <if test="streetId != '' and streetId != null">
+                AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
+                OR find_in_set(#{streetId},ALL_DEPT_IDS))
+            </if>
+            <if test="communityId != '' and communityId != null">
+                AND (find_in_set(#{communityId},PARENT_DEPT_IDS)
+                OR find_in_set(#{communityId},ALL_DEPT_IDS))
+            </if>
+            <if test="gridId != '' and gridId != null">
+                and find_in_set(#{gridId},ALL_DEPT_IDS)
+            </if>
+        order by CREATED_TIME desc
+    </select>
+</mapper>