From 9fe292927c986e3a7a89b903d1dca87b6a68107e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 4 Aug 2022 18:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IcResiCollectVisitorController.java       |  5 ++-
 .../epmet/dao/IcResiCollectVisitorDao.java    | 15 +++++++-
 .../service/IcResiCollectVisitorService.java  |  7 ++++
 .../impl/IcResiCollectVisitorServiceImpl.java | 12 ++++++
 .../mapper/IcResiCollectVisitorDao.xml        | 37 ++++++++++++++++++-
 5 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java
index 77462d9484..0406fd3abe 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java
@@ -37,8 +37,11 @@ public class IcResiCollectVisitorController {
 
     @RequestMapping("page")
     public Result<PageData<IcResiCollectVisitorDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.page(params);
+//        PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.page(params);
+        PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.getPhrasePage(params);
         return new Result<PageData<IcResiCollectVisitorDTO>>().ok(page);
+
+
     }
 
     @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java
index c0e1350d17..78ac67b898 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java
@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 居民信息采集-访客
  *
@@ -12,5 +16,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcResiCollectVisitorDao extends BaseDao<IcResiCollectVisitorEntity> {
-	
-}
\ No newline at end of file
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<IcResiCollectVisitorDTO> getPhrasePage(Map<String, Object> params);
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java
index 8b37f1165e..938332374b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java
@@ -29,6 +29,13 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
      */
     PageData<IcResiCollectVisitorDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<IcResiCollectVisitorDTO> getPhrasePage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
index fa10b6ff8b..7a2caa3bc1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
@@ -48,6 +48,18 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         return getPageData(page, IcResiCollectVisitorDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<IcResiCollectVisitorDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<IcResiCollectVisitorDTO> page = getPage(params);
+        List<IcResiCollectVisitorDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<IcResiCollectVisitorDTO> list(Map<String, Object> params) {
         List<IcResiCollectVisitorEntity> entityList = baseDao.selectList(getWrapper(params));
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 df19b6e5df..b810bef2ca 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
@@ -30,5 +30,40 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getPhrasePage" resultType="com.epmet.dto.IcResiCollectVisitorDTO">
+        select
+            ID,
+            CUSTOMER_ID,
+            GRID_ID,
+            AGENCY_ID,
+            PIDS,
+            VILLAGE_ID,
+            VILLAGE_NAME,
+            BUILD_ID,
+            BUILD_NAME,
+            UNIT_ID,
+            UNIT_NAME,
+            HOME_ID,
+            HOME_NAME,
+            ADDRESS,
+            NAME,
+            MOBILE,
+            ID_CARD,
+            COME_REASON,
+            FACE_IMG,
+            DEL_FLAG,
+            REVISION,
+            CREATED_BY,
+            CREATED_TIME,
+            UPDATED_BY,
+            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}
+        </if>
+        order by CREATED_TIME desc
+    </select>
 
-</mapper>
\ No newline at end of file
+
+</mapper>