Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-28 230dba4f152e7d744b8e6c1124a94d21d2e59018

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java

@@ -266,7 +266,7 @@
     * @return
     */
    @Override
    public R unitStatisticsTop(Long communityId, String belongTo, String choice) {
    public R unitStatisticsTop(Long communityId, String belongTo, String choice,Long[] unitIds) {
        List<Long> communityIds = new ArrayList<>();
        if (null != communityId){
             communityIds = comPbMemberDAO.selectIds(communityId);
@@ -275,7 +275,7 @@
            }
        }

        return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice));
        return R.ok(this.baseMapper.unitStatisticsTop(communityIds, belongTo, choice,unitIds));
    }

    /**
@@ -306,7 +306,7 @@
     * @return
     */
    @Override
    public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId) {
    public R pbStatisticsTop(Long communityId, String belongTo, String choice, Long checkUnitId,Long[] unitIds) {

        List<Long> communityIds = new ArrayList<>();
        if (null != communityId){
@@ -315,7 +315,7 @@
                communityIds.add(communityId);
            }
        }
        return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId));
        return R.ok(this.baseMapper.pbStatisticsTop(communityIds, belongTo, choice, checkUnitId,unitIds));
    }

    /**