修改bug

huanghongfa

2021-07-08 aba489c74e27e36ece27c5e1b8f591560775cf90

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -13,14 +13,16 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -3407,10 +3409,191 @@
    R getGridPopulationStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 综治后台-居民导出
     * 综治后台-居民导出查询居民数据
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    @PostMapping("/population/grid/export")
    R getGridPopulationExport(@RequestBody ComMngPopulationExportDTO populationExportDTO);

    /**
     * 综治后台-居民管理小区列表
     * @param name  小区名字
     * @return  小区列表
     */
    @GetMapping("/population/village/relation")
    R relationVillage(@RequestParam("name") String name);

    /**
     * 综治后台-居民管理-级联列表
     * @param subordinateDTO    请求参数
     * @return  级联列表
     */
    @PostMapping("/population/subordinate")
    R subordinate(@RequestBody ComMngPopulationSubordinateDTO subordinateDTO);

    /**
     * 综治后台-居民关联房屋
     * @param relationHouseDTO  请求参数
     * @return  关联结果
     */
    @PostMapping("/population/relation/house")
    R populationRelationHouse(@RequestBody ComMngPopulationRelationHouseDTO relationHouseDTO);

    /**
     * 综治后台-批量删除小区
     * @param villageIds    小区id集合
     * @return  删除结果
     */
    @PostMapping("/village/admin/del")
    R delGridVillage(@RequestBody List<Long> villageIds);

    /**
     * 综治后台-小区内居民列表
     * @param villagePopulationDTO  请求参数
     * @return  居民列表
     */
    @PostMapping("/village/admin/population/list")
    R getVillagePopulationAdmin(@RequestBody PageComMngVillagePopulationDTO villagePopulationDTO);

    /**
     * 综治后台-居民下房屋列表
     * @param villagePopulationHouseDTO 请求参数
     * @return  房屋列表
     */
    @PostMapping("/village/admin/population/house/list")
    R getVillagePopulationHouseAdmin(@RequestBody PageComMngVillagePopulationHouseDTO villagePopulationHouseDTO);

    /**
     * 综治后台-小区统计
     * @return  小区统计结果
     */
    @GetMapping("/village/admin/statistics")
    R getGridVillageStatistics();

    /**
     * 综治后台-小区列表导出
     * @param villageListAppDTO 请求参数
     * @return  小区列表
     */
    @PostMapping("/village/admin/export")
    R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    @PostMapping("/easy/photo/activity/page")
    R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);

    /**
     * 社区后台-添加随手拍活动
     * @param addEasyPhotoActivityDTO   请求参数
     * @return  添加结果
     */
    @PostMapping("/easy/photo/activity/add")
    R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);

    /**
     * 社区后台-编辑随手拍活动
     * @param editEasyPhotoActivityDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/easy/photo/activity/edit")
    R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);

    /**
     * 社区后台-取消随手拍活动
     * @param id    随手拍活动id
     * @return  取消结果
     */
    @GetMapping("/easy/photo/activity/cancel")
    R cancelEasyPhotoActivity(@RequestParam("id") Long id);

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param pageEasyPhotoActivityUserDTO  请求参数
     * @return  居民参与记录
     */
    @PostMapping("/easy/photo/activity/page/user")
    R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    @PostMapping("timeTaskEasyPhotoActivity")
    R timedTaskEasyPhotoActivity();

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    @PostMapping("/user/wallet/page")
    R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);

    /**
     * 用户结算收益
     * @param settlementAdminDTO    请求参数
     * @return  结算结果
     */
    @PostMapping("/user/wallet/settlement")
    R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);

    /**
     * 分页查询交易记录
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录列表
     */
    @PostMapping("/user/wallet/trade/page")
    R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("/easyphoto/statistics")
    R easyPhotoStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    @PostMapping("/neighbor/pageNeighborTopicByAdmin")
    R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("/neighbor/addNeighborTopicByAdmin")
    R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    @PostMapping("/neighbor/editNeighborTopicByAdmin")
    R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    R getCommunityLists();
}