From eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 09:34:00 +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/EventGridDataMapper.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 7cbae12..f99d753 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
@@ -8,6 +8,8 @@
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.UserEventGridDataVO;
+import com.panzhihua.common.model.vos.grid.EventGridAdminVO;
+import com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import org.apache.ibatis.annotations.Mapper;
@@ -29,10 +31,10 @@
/**
* 分页查询
*
- * @param pageEventGridDataDTO
+ * @param eventGridDataDTO
* @return
*/
- IPage<EventGridDataVO> findByPage(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
+ IPage<EventGridAdminVO> findByPage(Page page, @Param("eventGridDataDTO") PageEventGridDataDTO eventGridDataDTO);
/**
* 分页查询网格员所在网格
@@ -48,4 +50,13 @@
* @return
*/
List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
+ /**
+ * 查询社区下所有网格员
+ * @param communityId 社区id
+ * @return 网格员列表
+ */
+ List<EventGridMemberAdminVO> getGridMemberLists(@Param("communityId") Long communityId);
+
+ List<String> getGridMember(@Param("gridId") Long gridId);
+
}
--
Gitblit v1.7.1