From f0e91343445b1e568d1dfe705252d3e1201a18a7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 七月 2022 18:02:36 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
index 88c2323..f1d2e8c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
@@ -133,12 +133,14 @@
* 报到单位统计-顶部数据
* @param communityId
* @param belongTo
+ * @param choice
* @return
*/
@GetMapping("/statistics/top")
public R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
- @RequestParam(value = "belongTo") String belongTo) {
- return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo);
+ @RequestParam(value = "belongTo") String belongTo,
+ @RequestParam(value = "belongTo", required = false) String choice) {
+ return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo, choice);
}
/**
@@ -155,12 +157,16 @@
* 报到党员统计-顶部数据
* @param communityId
* @param belongTo
+ * @param choice
+ * @param checkUnitId
* @return
*/
@GetMapping("/pbStatistics/top")
public R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
- @RequestParam(value = "belongTo") String belongTo) {
- return comPbCheckUnitService.pbStatisticsTop(communityId, belongTo);
+ @RequestParam(value = "belongTo") String belongTo,
+ @RequestParam(value = "choice", required = false) String choice,
+ @RequestParam(value = "checkUnitId", required = false) Long checkUnitId) {
+ return comPbCheckUnitService.pbStatisticsTop(communityId, belongTo, choice, checkUnitId);
}
/**
--
Gitblit v1.7.1