Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-11-03 c3811d01d1929a98a0f34f70ca187d82ee312dbb

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

@@ -2532,12 +2532,12 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @param ids
     *            实有人口id集合
     * @return 删除结果
     */
    @PostMapping("/common/data/population/delete")
    R deletePopulations(@RequestBody List<Long> Ids);
    R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);

    /**
     * 根据社区id查询所有实有人口
@@ -4575,6 +4575,14 @@
     */
    @PostMapping("/village/grid/list")
    R getGridVillageList(@RequestBody ComMngVillageListAppDTO villageListAppDTO);

    /**
     * 综治app-小区列表
     * @param villageListAppDTO 请求参数
     * @return  小区列表
     */
    @PostMapping("/village/grid/list/app")
    R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);

    /**
     * 综治app-根据小区id查询小区下楼栋列表
@@ -6982,6 +6990,13 @@
    R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);

    /**
     * 实有房屋数据修复定时任务
     * @return  实有房屋数据修复定时任务
     */
    @GetMapping("/population/house/status/task")
    R timedTaskHouseJobHandler();

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
@@ -7039,4 +7054,105 @@
     */
    @GetMapping("/activity/my-evaluate")
    R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);

    /**
     * 导出特殊群体
     *
     * @param pageInputUserDTO
     *            请求参数
     * @return 特殊群体列表
     */
    @PostMapping("common/data/special/export")
    R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAnnouncement/queryAll")
    R comActAnnouncementSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAnnouncement/{id}")
    R comActAnnouncementSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAnnouncement")
    R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);

    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAnnouncement/update")
    R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAnnouncement/del")
    R comActAnnouncementDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActColumn/queryAll")
    R comActColumnSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActColumn/{id}")
    R comActColumnSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActColumn 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActColumn")
    R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);

    /**
     * 修改数据
     *
     * @param comActColumn 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActColumn/update")
    R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActColumn/del")
    R comActColumnDelete(@RequestParam("id") Long id);

}