From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期四, 13 十月 2022 10:33:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 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 de63dc1..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 @@ -98,4 +98,54 @@ @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); + + /** + * 报到单位统计 + * @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); + + /** + * 报到党员统计-按单位归属统计 + * @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