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/api/EventGridDataApi.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index 0d9e81a..e73810c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -139,6 +139,29 @@
return eventGridDataService.editGridDataByAdmin(eventGridDataDTO);
}
+
+ /**
+ * 查询网格下所有网格员
+ * @param gridId
+ * @return
+ */
+ @PostMapping("/grid/member")
+ R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId){
+ return eventGridDataService.getGridMemberListsByGrid(gridId);
+ }
+
+ /**
+ * 查询网格下所有网格员
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/communitygrid")
+ R getGridDataListByCommunity(@RequestParam("gridId") Long communityId){
+ return eventGridDataService.getGridDataListByCommunity(communityId);
+ }
+
+
+
@PostMapping("/data/delete")
public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
return eventGridDataService.deleteGridDataByAdmin(Ids);
--
Gitblit v1.7.1