From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
index e475c73..4bcffad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
@@ -2,14 +2,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
+
+import java.util.List;
/**
* 区县/街道/社区/网格员网格数据管理 service
@@ -65,11 +64,18 @@
R getMapGridDetail(Long gridId);
/**
+ * 获取网格后台待处理事件统计信息
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO);
+
+ /**
* 分页查询网格
* @param eventGridDataDTO 请求参数
* @return 网格列表
*/
- R getGridMemberList(PageEventGridDataDTO eventGridDataDTO);
+ R getGridMemberList(PageEventGridDataAdminDTO eventGridDataDTO);
/**
* 查询社区下所有网格员
@@ -77,4 +83,34 @@
* @return 网格员列表
*/
R getGridMemberLists(Long communityId);
+
+ /**
+ * 后台新增网格
+ * @param eventGridDataDTO 请求参数
+ * @return 新增结果
+ */
+ R addGridDataByAdmin(EventGridDataAddAdminDTO eventGridDataDTO);
+
+ /**
+ * 后台修改网格
+ * @param eventGridDataDTO 请求参数
+ * @return 修改结果
+ */
+ R editGridDataByAdmin(EventGridDataEditAdminDTO eventGridDataDTO);
+
+ /**
+ * 查询网格下所有网格员
+ * @param gridId
+ * @return
+ */
+ R getGridMemberListsByGrid(Long gridId);
+
+ /**
+ * 查询网格下所有网格员
+ * @param communityId
+ * @return
+ */
+ R getGridDataListByCommunity(Long communityId);
+
+ R deleteGridDataByAdmin(List<Long> Ids);
}
--
Gitblit v1.7.1