From 9c8735c70d86a31081340ca78bb2b538ed11a6e5 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 18:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 10 +++++++++-
1 files changed, 9 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 74dad69..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
@@ -956,7 +956,7 @@
* @return 网格统计数据
*/
@PostMapping("/statistics/getGridEventStatistics")
- R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId);
+ R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId,@RequestParam("userId") Long userId);
/**
* 查询网格事件统计数据
@@ -1257,4 +1257,12 @@
*/
@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