From 3fa58ddc752cd1a60d0c0d854a310bc8755ed437 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 23 Mar 2020 10:26:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0del=5Fflag=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E9=99=8C=E7=94=9F=E4=BA=BA=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=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 #{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 getStrangerAccessRecordPage(Map params) { - List list = strangerAccessRecordDao.getStrangerAccessRecordPage(params); - return getPageData(list,list.size(), StrangerAccessRecordDTO.class); + + IPage page = baseDao.selectPage( + getPage(params, "VISIT_TIME",false), + getWrapper(params) + ); + + //List list = strangerAccessRecordDao.getStrangerAccessRecordPage(params); + return getPageData(page,StrangerAccessRecordDTO.class); } @Override public PageData page(Map params) { @@ -76,12 +79,23 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl + * @author + * @date + */ private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); QueryWrapper 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; } From a2d9ac91b9e31d9943f787998db4f0a17c1c5fc8 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 23 Mar 2020 10:48:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E8=AE=B0=E5=BD=95service/dao/mapper=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dao/StrangerAccessRecordDao.java | 7 ------- .../impl/StrangerAccessRecordServiceImpl.java | 1 - .../mapper/StrangerAccessRecordDao.xml | 19 ------------------- 3 files changed, 27 deletions(-) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java index 625e30b399..709533248a 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/dao/StrangerAccessRecordDao.java @@ -33,11 +33,4 @@ import java.util.Map; */ @Mapper public interface StrangerAccessRecordDao extends BaseDao { - /** - * 查询陌生人访问记录 - * @param params - * @author yangshaoping - * @date 2020-03-19 - */ - List getStrangerAccessRecordPage(Map params); } \ No newline at end of file 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 7f4f3b3e14..06975cc16d 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 @@ -60,7 +60,6 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl list = strangerAccessRecordDao.getStrangerAccessRecordPage(params); return getPageData(page,StrangerAccessRecordDTO.class); } @Override diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml index ee340ac3e7..f790fb7e3a 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/mapper/StrangerAccessRecordDao.xml @@ -21,23 +21,4 @@ - - - - - - - \ No newline at end of file