From 607cd08dd8e808632388f188eeb7ba2724e41f75 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:20:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcResiCollectVisitorDao.xml | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) 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 f525fb9e6d..51d9d601dc 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 @@ -60,8 +60,32 @@ UPDATED_TIME from ic_resi_collect_visitor where DEL_FLAG = '0' - - AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + + AND ID_CARD = #{idCard} + + + AND NAME = #{name} + + + AND MOBILE = #{mobile} + + + AND VILLAGE_ID = #{villageId} + + + AND BUILD_ID = #{buildId} + + + AND UNIT_ID = #{unitId} + + + AND HOME_ID = #{homeId} + + + AND CREATED_TIME >= #{startTime} + + + AND CREATED_TIME <= #{endTime} order by CREATED_TIME desc From 21bcbd251b7fdd2c44cb291388ce1504118f1c0c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:33:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiCollectVisitorServiceImpl.java | 5 +++++ .../src/main/resources/mapper/IcResiCollectVisitorDao.xml | 1 + 2 files changed, 6 insertions(+) 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 5a5937324a..ebf5832ca8 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 @@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcResiCollectVisitorDao; @@ -49,6 +50,9 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl getPhrasePage(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); IPage page = getPage(params); List list = baseDao.getPhrasePage(params); return new PageData<>(list, page.getTotal()); 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 51d9d601dc..4ec0676f2c 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 @@ -60,6 +60,7 @@ UPDATED_TIME from ic_resi_collect_visitor where DEL_FLAG = '0' + AND CUSTOMER_ID = #{customerId} AND ID_CARD = #{idCard} From 039a7a02f332f7dda2d11a66aaa47fd72e52afbe Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 14:50:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcResiCollectVisitorDao.xml | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) 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 4ec0676f2c..35189406b9 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 @@ -120,8 +120,33 @@ UPDATED_TIME from ic_resi_collect_visitor where DEL_FLAG = '0' - - AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + AND CUSTOMER_ID = #{customerId} + + AND ID_CARD = #{idCard} + + + AND NAME = #{name} + + + AND MOBILE = #{mobile} + + + AND VILLAGE_ID = #{villageId} + + + AND BUILD_ID = #{buildId} + + + AND UNIT_ID = #{unitId} + + + AND HOME_ID = #{homeId} + + + AND CREATED_TIME >= #{startTime} + + + AND CREATED_TIME <= #{endTime} AND CONCAT(PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') From 2fcf6267bb7d9a0416ffa7e168a44a0268c4abff Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:12:59 +0800 Subject: [PATCH 4/5] no message --- .../java/com/epmet/dto/form/VisitListFormDTO.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java index 09ca9bf294..a12f07b46d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java @@ -23,4 +23,16 @@ public class VisitListFormDTO extends PageFormDTO { private String orgId; + private String idCard; + + private String name; + + private String villageId; + + private String buildId; + + private String unitId; + + private String homeId; + } From 3d52c9fa110b8efec76a3bbeb83442c71087385c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 22 Aug 2022 15:20:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/VisitListFormDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java index a12f07b46d..4ec572ad88 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitListFormDTO.java @@ -35,4 +35,6 @@ public class VisitListFormDTO extends PageFormDTO { private String homeId; + private String mobile; + }