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..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 @@ -23,4 +23,18 @@ 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; + + private String mobile; + } 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 f525fb9e6d..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 @@ -60,8 +60,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} order by CREATED_TIME desc @@ -95,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},'%')