From c62d25bf9cf51d7421035abd6489945e77db1f04 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 04 六月 2021 18:29:18 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 b0e4a0a..1567da5 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
@@ -4,12 +4,12 @@
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.vos.grid.EventGridAdminVO;
-import com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO;
+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;
@@ -32,7 +32,7 @@
* @param eventGridDataDTO
* @return
*/
- IPage<EventGridAdminVO> findByPage(Page page, @Param("eventGridDataDTO") PageEventGridDataDTO eventGridDataDTO);
+ IPage<EventGridAdminVO> findByPage(Page page, @Param("pageEventGridDataDTO") PageEventGridDataAdminDTO eventGridDataDTO);
/**
* 分页查询网格员所在网格
@@ -43,12 +43,22 @@
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<String> getGridMember(@Param("gridId") Long gridId);
+ List<GridMemberAdminVO> getGridMember(@Param("gridId") Long gridId);
+
+ ComGridActVO getComActByActId(@Param("communityId") Long communityId);
+
+ void removeGridRelationByGridId(@Param("gridId") Long gridId);
}
--
Gitblit v1.7.1