From c7c38dfd96047930999bcd7cf62d18d6d8651108 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 f99d753..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
@@ -5,13 +5,11 @@
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.UserEventGridDataVO;
-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;
@@ -34,7 +32,7 @@
* @param eventGridDataDTO
* @return
*/
- IPage<EventGridAdminVO> findByPage(Page page, @Param("eventGridDataDTO") PageEventGridDataDTO eventGridDataDTO);
+ IPage<EventGridAdminVO> findByPage(Page page, @Param("pageEventGridDataDTO") PageEventGridDataAdminDTO eventGridDataDTO);
/**
* 分页查询网格员所在网格
@@ -57,6 +55,10 @@
*/
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