From c62d25bf9cf51d7421035abd6489945e77db1f04 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期五, 04 六月 2021 18:29:18 +0800 Subject: [PATCH] Merge branch 'test_future_wangge' into 'test' --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java index cc907f5..d8031a2 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.grid.PageEventDTO; +import com.panzhihua.common.model.dtos.grid.PageEventManageDTO; +import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO; import com.panzhihua.common.model.vos.grid.ComMapGridEventVO; import com.panzhihua.service_grid.model.dos.EventDO; import com.panzhihua.common.model.vos.grid.EventVO; @@ -25,7 +27,7 @@ public interface EventMapper extends BaseMapper<EventDO> { /** - * 分页查询 + * 分页查询事件 * * @param pageEventDTO * @return @@ -33,10 +35,31 @@ IPage<EventVO> findByPage(Page page, @Param("pageEventDTO") PageEventDTO pageEventDTO); /** + * 分页查询宣传教育 + * + * @param pagePublicityEventDTO + * @return + */ + IPage<EventVO> findPublicityByPage(Page page, @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO); + /** * 地图模块-根据网格id查询网格办件事件 * @param gridId 网格id * @return 网格办件事件 */ List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId); + /** + * 根据网格员id查询网格员头像url + * @param gridMemberId 网格员id + * @return 头像url + */ + String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId); + + /** + * 查询事件(管理)列表 + * @param page + * @param pageEventManageDTO + * @return + */ + IPage<EventVO> findToManageByPage(Page page, @Param("pageEventManageDTO") PageEventManageDTO pageEventManageDTO); } -- Gitblit v1.7.1