From dd658a51be81d68bf3559c7eaa645fb7bb00b7af Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 10 十一月 2021 11:27:34 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 d309b0e..c87f0d2 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
@@ -255,12 +255,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);
}
/**
@@ -312,4 +312,14 @@
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