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/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
index c843ea2..70a9501 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/StatisticsApi.java
@@ -43,8 +43,8 @@
* @return 网格统计数据
*/
@PostMapping("/getGridEventStatistics")
- public R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId){
- return eventService.getGridEventStatisticsByApp(gridId);
+ public R getGridEventStatisticsByApp(@RequestParam("gridId") Long gridId,@RequestParam("userId") Long userId){
+ return eventService.getGridEventStatisticsByApp(gridId,userId);
}
/**
@@ -56,4 +56,14 @@
public R getGridEventDetailStatisticsByApp(@RequestBody GridEventStatisticsDTO statisticsDTO){
return eventService.getGridEventDetailStatisticsByApp(statisticsDTO);
}
+
+ /**
+ * 查询所有网格员工作汇总数据
+ * @param statisticsAdminDTO 请求参数
+ * @return 网格员工作汇总数据
+ */
+ @PostMapping("/admin/gridMemberStatisticsAll")
+ public R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO){
+ return eventService.gridMemberStatisticsAll(statisticsAdminDTO);
+ }
}
--
Gitblit v1.7.1