From 92e2be60c2d92ab5c8524c76f97712cd9f66502d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 11:44:35 +0800
Subject: [PATCH] 10.18.1
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 380617c..8fcd7e0 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -109,12 +109,13 @@
* @return
*/
@RequestMapping("/base/site/addSite")
- public Object addSite(@RequestBody Site site){
+ public Integer addSite(@RequestBody Site site){
if(site.getId()!= null ){
-
- return siteService.updateById(site);
+ siteService.updateById(site);
+ return site.getId();
}else {
- return siteService.save(site);
+ boolean save = siteService.save(site);
+ return site.getId();
}
}
@@ -204,10 +205,12 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "场地id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(value = "日期（2023-01-01）", name = "day", dataType = "string", required = true),
+ @ApiImplicitParam(value = "选择场地的名称", name = "day", dataType = "string", required = true),
+ @ApiImplicitParam(value = "半场名称", name = "day", dataType = "string", required = false)
})
- public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day){
+ public ResultUtil<List<QuerySiteTimes>> querySiteTimes(Integer id, String day,String halfName,String siteName){
try {
- List<QuerySiteTimes> list = siteService.querySiteTimes(id, day);
+ List<QuerySiteTimes> list = siteService.querySiteTimes(id, day,halfName,siteName);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
@@ -351,7 +354,11 @@
try {
HashMap<String, Object> map = new HashMap<>();
SiteBooking byId = siteBookingService.getById(id);
+ Integer storeId = byId.getStoreId();
+ Store byId1 = service.getById(storeId);
+
List<Integer> ids = getIds(byId.getSiteId());
+ byId.setStorePhone(byId1.getPhone());
map.put("data",byId);
map.put("ids",ids);
return ResultUtil.success(map);
@@ -543,10 +550,10 @@
@ResponseBody
@PostMapping("/base/site/getNewAddSiteList")
- public List<SiteVo> getAppUserSiteList(){
+ public List<SiteVo> getAppUserSiteList(@RequestBody Integer storeId){
List<SiteVo> siteVos = new ArrayList<>();
- List<Site> list = siteService.list(new QueryWrapper<Site>()
+ List<Site> list = siteService.list(new QueryWrapper<Site>().eq("state",1).eq("storeId",storeId)
.orderByDesc("insertTime"));
if (list.size() > 0 ){
for (Site site : list) {
--
Gitblit v1.7.1