From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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..a0f90d2 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,17 +4,14 @@
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.vos.grid.ComMapGridEventVO;
-import com.panzhihua.common.model.vos.grid.EventStatisticsAllAdminVO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.model.dos.EventDO;
-import com.panzhihua.common.model.vos.grid.EventVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* DAO
@@ -64,7 +61,41 @@
*/
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);
+
+ /**
+ * 根据网格id查询网格统计数据
+ * @param gridId 网格id
+ * @return 网格统计数据
+ */
+ GridEventStatisticsVO getGridEventStatisticsByApp(@Param("gridId") Long gridId);
+
+ /**
+ * 查询网格事件统计数据
+ * @param statisticsDTO 请求参数
+ * @return 网格事件统计数据
+ */
+ GridEventStatisticsDetailVO getGridEventDetailStatisticsByApp(@Param("statisticsDTO") GridEventStatisticsDTO statisticsDTO);
+
+ /**
+ * 查询时间发布者基本信息
+ * @param gridMemberId
+ * @return
+ */
+ Map<String, Object> getUserBaseInfo(@Param("gridMemberId")Long gridMemberId);
}
--
Gitblit v1.7.1