From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 1e65581..799d2a8 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
@@ -4,11 +4,10 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.dtos.grid.*;
 import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
 import com.panzhihua.common.model.vos.grid.EventStatisticsAllAdminVO;
+import com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO;
 import com.panzhihua.service_grid.model.dos.EventDO;
 import com.panzhihua.common.model.vos.grid.EventVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -64,6 +63,19 @@
      */
     IPage<EventVO> findToManageByPage(Page page, @Param("pageEventManageDTO") PageEventManageDTO pageEventManageDTO);
 
+    /**
+     * 查询事件(管理)列表
+     * @param page
+     * @param pagePublicityEventCommunityDTO
+     * @return
+     */
+    IPage<EventVO> findCommunityPublicityByPage(Page page, @Param("pagePublicityEventCommunityDTO") PagePublicityEventCommunityDTO pagePublicityEventCommunityDTO);
+
+    /**
+     * 后台管理-统计模块
+     * @param communityId   社区id
+     * @return  统计信息
+     */
     EventStatisticsAllAdminVO eventStatistics(@Param("communityId") Long communityId);
 
     Integer getEventCountByGridIds(@Param("ids") List<Long> ids);

--
Gitblit v1.7.1