From eb0e0847f4030ec96d18ab0e632aa1668ff6126d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 24 六月 2021 16:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_esay_photo' into test_esay_photo
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 50235b9..7d23ba4 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
@@ -907,6 +907,14 @@
R getScreenEventList(@RequestBody ScreenEventListDTO eventListDTO);
/**
+ * 特殊人群上报-社区人口数据列表
+ * @param specialPopulationDTO 请求参数
+ * @return 社区人口数据列表
+ */
+ @PostMapping("/event/special/population/list")
+ R specialPopulationList(@RequestBody PageEventSpecialPopulationDTO specialPopulationDTO);
+
+ /**
* description 根据本地网格ID，查询对于的浪潮市平台对应的ID
*
* @param id 本地网格ID
@@ -945,6 +953,13 @@
@GetMapping("/event/updateLcUploadFlag")
Boolean updateLcUploadFlag(@RequestParam("id")Long id);
+ /**
+ * 工作大屏-事件管理模块数据统计
+ * @param communityId 社区id
+ * @return 事件管理数据统计
+ */
+ @GetMapping("/screen/work/event")
+ R eventWork(@RequestParam("communityId")Long communityId);
/**
* 后台统计走访任务
@@ -1038,7 +1053,7 @@
* @return
*/
@PostMapping("/eventvisitingtasks/start")
- R start(@RequestParam("id")Long id);
+ R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId);
/**
* 完成走访记录
--
Gitblit v1.7.1