From 78a4df6ad36a5cdf18d40ef539e0ce9609c71b4f Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期六, 07 十月 2023 15:33:28 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 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 32bb027..5c0343c 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 @@ -62,16 +62,28 @@ @Autowired private CityManagerClient cityManagerClient; - + /** + * 获取所有场地 + */ + @RequestMapping("/base/site/getList") + @ResponseBody + public List<Site> getList(){ + return siteService.list(new QueryWrapper<Site>().ne("state",3)); + } + /** + * 获取场地预约记录 + */ + @RequestMapping("/base/site/listAll") + public List<SiteBooking> listAll(@RequestBody SiteBookingQuery query){ + return siteBookingService.listAll(query); + } /** * 获取所有场地 * @return */ @RequestMapping("/base/site/list") public List<TSiteDTO> listAll(@RequestBody SiteSearchVO vo){ - return siteTypeService.listAll(vo); - } /** * 获取场地有效期在两个月内的场地列表 -- Gitblit v1.7.1