Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-09 acbf62b66a8dfeddbe1918b32c4e11697b4a5788

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

@@ -2530,12 +2530,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查询所有实有人口
@@ -4917,6 +4917,22 @@
    R getCommunityLists();

    /**
     * 查询西区社区列表
     *
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();

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

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO
@@ -5671,11 +5687,12 @@

    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @return  登记明细数据
     *
     * @param pageReserveRegisterDetailedAdminDTO
     * @return 登记明细数据
     */
    @GetMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
    @PostMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 查询预约登记题目列表
@@ -6996,6 +7013,129 @@
    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);

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

    /**
     * 导出特殊群体
     *
     * @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);

    /**
     * 高龄认证添加
     *
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/elders/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

    /**
     * 养老认证添加
     *
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/elders/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
    /**
     * 活动报名签到情况
     * @param id 活动主键id
     * @return
@@ -7011,4 +7151,30 @@
     */
    @GetMapping("/activity/regist/list")
    R listRegistRecord(@RequestParam("id")  Long id, @RequestParam("userId") Long userId);

    /**
     * 获取活动类型（目前只有志愿者活动需要获取）
     * @param communityId
     * @param type
     * @return
     */
    @GetMapping("/activity/type/list")
    R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

    /**
     * 添加活动类型
     * @param comActActivityTypeVO
     * @return
     */
    @PostMapping("/activity/type/add")
    R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);

    /**
     * 我的评价
     * @param userId
     * @param activityId
     * @return
     */
    @GetMapping("/activity/my-evaluate")
    R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
}