From 09188b70a64cea8de763c9ab7fe9c2f36c39db01 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 05 六月 2021 14:03:46 +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 |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 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..a14676f 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,9 @@
 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.PagePublicityEventCommunityDTO;
+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 +28,7 @@
 public interface EventMapper extends BaseMapper<EventDO> {
 
     /**
-     * 分页查询
+     * 分页查询事件
      *
      * @param pageEventDTO
      * @return
@@ -33,10 +36,39 @@
     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);
+
+    /**
+     * 查询事件(管理)列表
+     * @param page
+     * @param pagePublicityEventCommunityDTO
+     * @return
+     */
+    IPage<EventVO> findCommunityPublicityByPage(Page page, @Param("pagePublicityEventCommunityDTO") PagePublicityEventCommunityDTO pagePublicityEventCommunityDTO);
 }

--
Gitblit v1.7.1