From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
index 230a816..7c7d6b2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
@@ -1,15 +1,19 @@
package com.panzhihua.service_grid.dao;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
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.EventGridTodoDataDTO;
+import com.panzhihua.common.model.dtos.grid.PageEventGridDataAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
-import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.grid.PageEventGridNearbyDTO;
+import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
-import com.panzhihua.common.model.vos.grid.EventGridDataVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
/**
* DAO
@@ -25,10 +29,11 @@
/**
* 分页查询
*
- * @param pageEventGridDataDTO
+ * @param eventGridDataDTO
* @return
*/
- IPage<EventGridDataVO> findByPage(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
+ IPage<EventGridAdminVO> findByPage(Page page,
+ @Param("pageEventGridDataDTO") PageEventGridDataAdminDTO eventGridDataDTO);
/**
* 分页查询网格员所在网格
@@ -36,6 +41,35 @@
* @param pageEventGridDataDTO
* @return
*/
- IPage<EventGridDataVO> selectUserGrid(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
+ IPage<EventGridDataVO> selectUserGrid(Page page,
+ @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
+ /**
+ * 查询当前用户网格内待处理事件统计信息
+ *
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
+
+ /**
+ * 查询社区下所有网格员
+ *
+ * @param communityId
+ * 社区id
+ * @return 网格员列表
+ */
+ List<EventGridMemberAdminVO> getGridMemberLists(@Param("communityId") Long communityId);
+
+ List<GridMemberAdminVO> getGridMember(@Param("gridId") Long gridId);
+
+ ComGridActVO getComActByActId(@Param("communityId") Long communityId);
+
+ void removeGridRelationByGridId(@Param("gridId") Long gridId);
+
+ List<EventGridMemberAdminVO> getGridMemberListsByGrid(@Param("gridId") Long gridId);
+
+ List<EventGridDataAreaVO> getGridDataListByCommunity(@Param("communityId") Long communityId);
+
+ List<EventGridDataAreaVO> selectGridWithArea(Page page, PageEventGridNearbyDTO pageEventGridNearbyDTO);
}
--
Gitblit v1.7.1