Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 c168f544ecd041760e7d0fba66c48e06b9ab67dc

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java

@@ -336,13 +336,11 @@
    @Override
    public R statisticsPbMemberType(){
        List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.statisticsPbMemberType();
        Map<String, Integer> retMap = comPbMemberTypeVOS.stream().collect(Collectors.toMap(ComPbMemberTypeVO::getCountName, ComPbMemberTypeVO::getCountNum));
        return R.ok(retMap);
        return R.ok(comPbMemberTypeVOS);
    }

    public R selectUnitByNatureName(){
        List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.selectUnitByNatureName();
        Map<String, Integer> retMap = comPbMemberTypeVOS.stream().collect(Collectors.toMap(ComPbMemberTypeVO::getCountName, ComPbMemberTypeVO::getCountNum));
        return R.ok(retMap);
        return R.ok(comPbMemberTypeVOS);
    }
}