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/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |   80 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index d3a4309..562807f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1,8 +1,10 @@
 package com.panzhihua.common.service.grid;
 
 import com.panzhihua.common.model.dtos.IdDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenDrawEventListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
 import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
 import com.panzhihua.common.model.query.visit.EventTasksQuery;
 import com.panzhihua.common.model.query.visit.EventVisitListQuery;
 import com.panzhihua.common.model.vos.R;
@@ -954,7 +956,7 @@
      * @return 网格统计数据
      */
     @PostMapping("/statistics/getGridEventStatistics")
-    R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId);
+    R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId,@RequestParam("userId") Long userId);
 
     /**
      * 查询网格事件统计数据
@@ -1158,25 +1160,25 @@
     /**
      * 撤销走访
      *
-     * @param id
+     * @param idDTO
      * @return
      */
-    @PostMapping("/eventvisitingtasks/cancel/{id}")
-    R cancel(@PathVariable("id") Long id);
+    @PostMapping("/eventvisitingtasks/cancel")
+    R cancel(@RequestBody IdDTO idDTO);
 
     /**
      * 恢复走访
      *
-     * @param id
+     * @param idDTO
      * @return
      */
-    @PostMapping("/eventvisitingtasks/reset/{id}")
-    R reset(@PathVariable("id") Long id);
+    @PostMapping("/eventvisitingtasks/reset")
+    R reset(@RequestBody IdDTO idDTO);
 
     /**
      * 新增走访
      *
-     * @param ids
+     * @param idDTO
      * @param communityId
      * @param userId
      * @return
@@ -1201,4 +1203,66 @@
      */
     @PostMapping("/eventvisitingtasks/complete")
     R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);
+
+    /**
+     * 查询市平台网格员列表
+     * @return  市平台网格员列表
+     */
+    @GetMapping("/eventgridmemberrelation/lc/list")
+    R gridMemberLcList();
+
+    /**
+     * 综治后台-添加网格员级联列表
+     * @param memberCascadeAddDTO   请求参数
+     * @return  级联列表
+     */
+    @PostMapping("/eventgridmemberrelation/cascade/list")
+    R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);
+
+    /**
+     * 综治后台-查询所有市平台网格列表
+     * @return  市平台网格列表
+     */
+    @GetMapping("/eventgriddata/lc/list")
+    R getLcGridLists();
+
+    /**
+     * 首页查询网格级联列表
+     * @param cascadeListDTO    请求参数
+     * @return  网格列表
+     */
+    @PostMapping("/map/getMapGridListsByApp")
+    R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO);
+
+    /**
+     * 首页查询网格级联列表2
+     * @param userId    用户id
+     * @return  网格列表
+     */
+    @PostMapping("/map/getMapGridsListsByApp")
+    R getMapGridsListsByApp(@RequestParam("userId") Long userId);
+
+    /**
+     * 绘制多边形统计数据
+     * @param eventListDTO  请求参数
+     * @return  统计数据
+     */
+    @PostMapping("/screen/getCivilDrawList")
+    R getCivilDrawList(@RequestBody ScreenDrawEventListDTO eventListDTO);
+
+    /**
+     * 大屏-根据小区id查询小区统计人数
+     * @param villageId 小区id
+     * @return  小区统计数据
+     */
+    @GetMapping("/screen/village/statistics")
+    R civilVillageStatistics(@RequestParam("villageId") Long villageId);
+
+    /**
+     * 查询所有网格员工作汇总数据
+     * @param statisticsAdminDTO    请求参数
+     * @return  网格员工作汇总数据
+     */
+    @PostMapping("/statistics/admin/gridMemberStatisticsAll")
+    R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO);
 }

--
Gitblit v1.7.1