From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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..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
@@ -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();
}
@@ -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);
}
/**
@@ -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