From ddb1636307f95763f31f0c869a52c8c1a8619b12 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:13:40 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 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 874c113..c11ccad 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
@@ -19,7 +19,7 @@
* @author lyq
* @date 2022-02-16 16:22:48
*/
-@FeignClient(name = Constants.SERVICE_PARTYBUILDING, contextId = "comPbCheckUnit", path = "comPbCheckUnit")
+@FeignClient(name = "huacheng-partybuilding", contextId = "comPbCheckUnit", path = "comPbCheckUnit")
public interface ComPbCheckUnitFeign {
/**
@@ -98,4 +98,56 @@
@PostMapping("/importCheckUnit")
R importCheckUnit(@RequestBody List<ComPbCheckUnitExcelVO> list,@RequestParam(value = "communityId") Long communityId
,@RequestParam(value = "userId") Long userId);
+
+ /**
+ * 报到单位统计-顶部数据
+ * @param communityId
+ * @param belongTo
+ * @param choice
+ * @return
+ */
+ @GetMapping("/statistics/top")
+ R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
+ @RequestParam(value = "belongTo") String belongTo,
+ @RequestParam(value = "choice", required = false) String choice,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds);
+
+ /**
+ * 报到单位统计
+ * @param commonDto
+ * @return
+ */
+ @PostMapping("/statistics")
+ R unitStatistics(@RequestBody PagePbCheckUnitCommonDto commonDto);
+
+ /**
+ * 报到党员统计-顶部数据
+ * @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,
+ @RequestParam(value = "choice", required = false) String choice,
+ @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
+ @RequestParam(value = "unitIds", required = false) Long[] unitIds);
+
+ /**
+ * 报到党员统计-按单位归属统计
+ * @param commonDto
+ * @return
+ */
+ @PostMapping("/pbStatistics/belong")
+ R pbStatisticsBelong(@RequestBody PagePbCheckUnitCommonDto commonDto);
+
+ /**
+ * 报到党员统计-按单位统计
+ * @param commonDto
+ * @return
+ */
+ @PostMapping("/pbStatistics/unit")
+ R pbStatisticsUnit(@RequestBody PagePbCheckUnitCommonDto commonDto);
}
--
Gitblit v1.7.1