Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-28 230dba4f152e7d744b8e6c1124a94d21d2e59018

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

    /**