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/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
index 57984de..e23728e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
@@ -103,10 +103,13 @@
* 报到单位统计-顶部数据
* @param communityId
* @param belongTo
+ * @param choice
* @return
*/
@GetMapping("/statistics/top")
- R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId, @RequestParam(value = "belongTo") String belongTo);
+ R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "belongTo") String belongTo,
+ @RequestParam(value = "choice", required = false) String choice);
/**
* 报到单位统计
@@ -120,10 +123,15 @@
* 报到党员统计-顶部数据
* @param communityId
* @param belongTo
+ * @param choice
+ * @param checkUnitId
* @return
*/
@GetMapping("/pbStatistics/top")
- R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId, @RequestParam(value = "belongTo") String belongTo);
+ 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);
/**
* 报到党员统计-按单位归属统计
--
Gitblit v1.7.1