From 22498e4ff995e9069ad0ed72b2a249172375a714 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 30 八月 2021 10:50:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 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 ca3acd4..7890d53 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,12 +103,16 @@
* @return
*/
@GetMapping("/detail")
- public R detail(@RequestParam("id") Long id){
+ public R detail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId){
if(id!=null){
- return R.ok(comActReserveService.getById(id));
+ return comActReserveService.getById(id,userId,recordId);
}
return R.fail();
}
+
+ /**
+ *
+ */
/**
* 小程序提交预约/登记
@@ -281,21 +285,7 @@
*/
@PostMapping("/detailOperation")
public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
- if(comActReserveOperationRecordDO!=null){
- QueryWrapper<ComActReserveOperationRecordDO> queryWrapper=new QueryWrapper<>();
- if(comActReserveOperationRecordDO.getUserId()!=null){
- queryWrapper.eq("user_id",comActReserveOperationRecordDO.getUserId());
- }
- if(comActReserveOperationRecordDO.getReserveRecordId()!=null){
- queryWrapper.eq("reserve_record_id",comActReserveOperationRecordDO.getReserveRecordId());
- }
- if(comActReserveOperationRecordDO.getType()!=null){
- queryWrapper.eq("type",comActReserveOperationRecordDO.getType());
- }
- queryWrapper.orderByDesc("reserve_time");
- return R.ok(comActReserveOperationRecordService.list(queryWrapper));
- }
- return R.ok();
+ return comActReserveOperationRecordService.detailOperationRecord(comActReserveOperationRecordDO);
}
/**
--
Gitblit v1.7.1