Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 f80afdbc853857579ef24f6e679bde4be8b57e39

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -2445,6 +2445,10 @@
        return comActEasyPhotoService.getUserReward(userId, communityId);
    }

    @PostMapping("easyphoto/getUserRewardsNew")
    public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.getUserRewardNew(userId, communityId);
    }
    /**
     * 读取用户随手拍奖励
     * 
@@ -2767,4 +2771,45 @@
        return automessageSysUserService.selectAutomessageSysUserById(id);
    }

    /**
     * 根据id查询重复的社区id集合
     * @return
     */
    @GetMapping("selectBasicData")
    public R selectBasicData(){
        return comActService.selectBasicData();
    }

    /**
     * 统计在职干部特长
     * @return
     */
    @GetMapping("statisticsPbMemberType")
    public R statisticsPbMemberType(){
        return comActService.statisticsPbMemberType();
    }

    /**
     * 统计单位
     * @return
     */
    @GetMapping("selectUnitByNatureName")
    public R selectUnitByNatureName(){
        return comActService.selectUnitByNatureName();
    }

    /**
     * 大屏-社区活动分页
     * @return
     */
    @GetMapping("pageActivityBigScreen")
    public R pageActivityBigScreen(@RequestBody CommonPage commonPage){
        return comActActivityService.pageActivityBigScreen(commonPage);
    }

    @GetMapping("easyphoto/selectStatisticsPhoto")
    public R selectStatisticsPhoto() {
        return comActEasyPhotoService.selectStatisticsPhoto();
    }

}