From 91275344f85d2777be0f276e9d9da3f6f3fa6728 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 20 八月 2021 18:48:44 +0800
Subject: [PATCH] 实有人口和社区关系以及对应标签修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
index 33e4346..33703ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
@@ -2,10 +2,8 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
@@ -23,17 +21,17 @@
 
     /**
      * 新增网格和网格员的关联关系
-     * @param eventGridMemberRelationAddDTO
+     * @param eventGridMemberAddDTO
      * @return 新增结果
      */
-    R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
+    R add(EventGridMemberAddDTO eventGridMemberAddDTO);
 
     /**
      * 修改网格和网格员的关联关系
-     * @param eventGridMemberRelationEditDTO
+     * @param eventGridMemberEditDTO
      * @return 维护结果
      */
-    R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
+    R edit(EventGridMemberEditDTO eventGridMemberEditDTO);
 
     /**
      * 分页查找网格和网格员的关联关系
@@ -63,5 +61,19 @@
      */
     R getMapGridListByApp(Long userId);
 
+    /**
+     * 查询市平台网格员列表
+     * @return  市平台网格员列表
+     */
+    R lcList();
+
+    R gridMemberCascadeList(EventGridMemberCascadeAddDTO memberCascadeAddDTO);
+
+    R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO);
+
+    R getMapGridsListsByApp(Long userId);
+
+
+
 
 }

--
Gitblit v1.7.1