Merge branch 'huacheng' into huacheng_test

101captain

2022-07-28 f0e91343445b1e568d1dfe705252d3e1201a18a7

 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);
    }

    /**