From 230dba4f152e7d744b8e6c1124a94d21d2e59018 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 28 十月 2022 10:02:02 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java | 10 ++++++----
1 files changed, 6 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 7acc80f..f609c78 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
@@ -140,8 +140,9 @@
@GetMapping("/statistics/top")
public R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
@RequestParam(value = "belongTo") String belongTo,
- @RequestParam(value = "belongTo", required = false) String choice) {
- return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo, choice);
+ @RequestParam(value = "belongTo", required = false) String choice,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds) {
+ return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo, choice,unitIds);
}
/**
@@ -166,8 +167,9 @@
public R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
@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);
+ @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds) {
+ return comPbCheckUnitService.pbStatisticsTop(communityId, belongTo, choice, checkUnitId,unitIds);
}
/**
--
Gitblit v1.7.1