Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -111,8 +111,14 @@
    }

    /**
     *
     * 外部调用提交预约/登记
     * @param comActReserveCommitVO
     * @return
     */
    @PostMapping("/commitNoToken")
    public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
        return comActReserveService.commitNoToken(comActReserveCommitVO);
    }

    /**
     * 小程序提交预约/登记
@@ -255,12 +261,12 @@

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

    /**
@@ -322,4 +328,29 @@
    public R list(@RequestParam("communityId") Long communityId){
        return comActReserveService.reserveListApplets(communityId);
    }

    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/admin/register/homeQuarantine/page")
    public R pageRegisterHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return comActReserveAnswerContentService.pageRegisterHomeQuarantine(detailedAdminDTO);
    }

    /**
     * 居家隔离导出
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/admin/homeQuarantine/export")
    public R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        return comActReserveAnswerContentService.exportHomeQuarantine(detailedAdminDTO);
    }

    @GetMapping("/bigScreenStaticsReserve")
    public R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId){
        return comActReserveAnswerContentService.bigScreenStaticsReserve(communityId);
    }
}