From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 08 十月 2021 11:30:14 +0800 Subject: [PATCH] bug修复 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java index 27e24e8..b98b028 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java @@ -103,9 +103,9 @@ * @return */ @GetMapping("/detail") - public R detail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId){ + public R detail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack){ if(id!=null){ - return comActReserveService.getById(id,userId,recordId); + return comActReserveService.getById(id,userId,recordId,isBack); } return R.fail(); } @@ -307,4 +307,19 @@ public R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO){ return comActReserveAnswerContentService.registerDetailedListAdmin(detailedAdminDTO); } + + @GetMapping("/admin/register/detailed/detail") + public R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId){ + return comActReserveRecordService.registerDetailedDetailAdmin(reserveRecordId); + } + + /** + * 小程序查询所有进行中的预约登记 + * @param communityId 社区id + * @return 社区所有进行中的预约登记列表 + */ + @GetMapping("/list") + public R list(@RequestParam("communityId") Long communityId){ + return comActReserveService.reserveListApplets(communityId); + } } -- Gitblit v1.7.1