From 3fa58ddc752cd1a60d0c0d854a310bc8755ed437 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 23 Mar 2020 10:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0del=5Fflag=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E9=99=8C=E7=94=9F=E4=BA=BA=E8=AE=BF=E5=AE=A2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/CustomerGridDao.xml | 15 ++++++----
 .../impl/StrangerAccessRecordServiceImpl.java | 30 ++++++++++++++-----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index dcad7821b6..6350399a83 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -31,8 +31,9 @@
         FROM
             CUSTOMER_GRID
         WHERE
-            AREA_CODE = #{areaCode}
-
+            del_flag = 0
+        AND
+            area_code = #{areaCode}
         ORDER BY
             customer_id,
             CONVERT ( grid_name USING gbk ) ASC
@@ -69,8 +70,9 @@
         FROM
             CUSTOMER_GRID
         WHERE
-            AREA_CODE LIKE CONCAT(#{areaCode},'%')
-
+            del_flag = 0
+        AND
+            area_code LIKE CONCAT(#{areaCode},'%')
         ORDER BY
             customer_id,
             CONVERT ( grid_name USING gbk ) ASC
@@ -96,8 +98,9 @@
             FROM
                 CUSTOMER_GRID a
             WHERE
+                a.del_flag = 0
+            AND
                 a.area_code = #{areaCode}
-
             ORDER BY
                 CONVERT ( a.grid_name USING gbk ) ASC
 
@@ -113,6 +116,8 @@
             FROM
                 CUSTOMER_GRID b
             WHERE
+                b.del_flag = 0
+            AND
                 b.area_code LIKE CONCAT(#{cityCode},'%')
 
             AND <![CDATA[ b.area_code <> #{areaCode}
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
index f65ec84d32..7f4f3b3e14 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
@@ -21,17 +21,14 @@ import com.epmet.service.StrangerAccessRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.tools.page.PageData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Map;
 /**
  * @Description 陌生人记录访问表
  * @ClassName ResiGuideServiceImpl
@@ -57,8 +54,14 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
      */
     @Override
     public PageData<StrangerAccessRecordDTO> getStrangerAccessRecordPage(Map<String, Object> params) {
-        List<StrangerAccessRecordEntity> list = strangerAccessRecordDao.getStrangerAccessRecordPage(params);
-        return getPageData(list,list.size(), StrangerAccessRecordDTO.class);
+
+        IPage<StrangerAccessRecordEntity> page = baseDao.selectPage(
+                getPage(params, "VISIT_TIME",false),
+                getWrapper(params)
+        );
+
+        //List<StrangerAccessRecordEntity> list = strangerAccessRecordDao.getStrangerAccessRecordPage(params);
+        return getPageData(page,StrangerAccessRecordDTO.class);
     }
     @Override
     public PageData<StrangerAccessRecordDTO> page(Map<String, Object> params) {
@@ -76,12 +79,23 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
         return ConvertUtils.sourceToTarget(entityList, StrangerAccessRecordDTO.class);
     }
 
+    /**
+     * sql语句条件查询拼接
+     * 陌生人访客记录，逻辑删除标识为0，访问时间为当前三天，按照访问时间降序排列
+     * @param params
+     * @return QueryWrapper<StrangerAccessRecordEntity>
+     * @author
+     * @date
+     */
     private QueryWrapper<StrangerAccessRecordEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<StrangerAccessRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
+        Calendar before3daysDate = Calendar.getInstance();
+        before3daysDate.setTime(new Date());
+        before3daysDate.add(Calendar.DATE,-3);
+        wrapper.between("VISIT_TIME", before3daysDate.getTime(),new Date());
         return wrapper;
     }