diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index d708e93ab..586730771 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -81,10 +81,16 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl getWrapper(Map params){ String startTime = (String)params.get("startTime"); String endTime = (String)params.get("endTime"); + String streetId = (String)params.get("streetId"); + String communityId = (String)params.get("communityId"); + String gridId = (String)params.get("gridId"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.between(StringUtils.isNotBlank(startTime), Constant.CREATED_TIME, startTime, endTime); wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value()); + wrapper.eq(StringUtils.isNotBlank(streetId),"STREET_ID",streetId); + wrapper.eq(StringUtils.isNotBlank(communityId),"COMMUNITY_ID",communityId); + wrapper.eq(StringUtils.isNotBlank(gridId),"GRID_ID",gridId); return wrapper; }