From 973caebefdd691d45108d56fc96b9aa2e5fc6fe8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 七月 2021 16:59:30 +0800
Subject: [PATCH] 修改bug以及综治后台网格员工作汇总导出接口

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 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..9a21aed 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
@@ -7,6 +7,7 @@
 import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventGridDataVO;
 import com.panzhihua.service_grid.service.EventGridDataService;
+import com.panzhihua.service_grid.service.LcCompareCodeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +28,8 @@
 
     @Resource
     private EventGridDataService eventGridDataService;
+    @Resource
+    private LcCompareCodeService lcCompareCodeService;
 
 
     /**
@@ -95,7 +98,7 @@
      * @return  网格员列表
      */
     @PostMapping("/member/list")
-    public R getGridMemberLists(@RequestParam("communityId") Long communityId){
+    public R getGridMemberLists(@RequestParam(value = "communityId",required = false) Long communityId){
         return eventGridDataService.getGridMemberLists(communityId);
     }
 
@@ -139,8 +142,42 @@
         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);
     }
+
+    /**
+     * 综治后台-查询所有市平台网格列表
+     * @return  市平台网格列表
+     */
+    @GetMapping("/lc/list")
+    public R getLcGridLists(){
+        return lcCompareCodeService.getLcGridLists();
+    }
+
+
 }

--
Gitblit v1.7.1