From e9085eb620dcae1ceae24bc8b70e1a6bca228b15 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 19:58:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 74d3f46..b72b9d6 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -26,6 +26,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.*;
import com.dsh.guns.modular.system.service.*;
+import com.dsh.guns.modular.system.util.DateComparisonExample;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
@@ -1021,15 +1022,18 @@
private SiteClient siteClient;
+
+
@RequestMapping("/yuyuetimes/{id}")
@ResponseBody
- public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date) {
+ public List<OrderDto> yuyuetimes(@PathVariable("id") Integer id,String date,String siteName,String halfName) {
System.out.println("=======date======"+date);
List<String> strings = new ArrayList<>();
// List<SiteBooking> siteBookings = siteClient.listBooks(id);
- List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).like("times",date));
+ List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>()
+ .eq("siteId", id).like("times",date));
System.out.println("=======siteBookings======"+siteBookings);
for (SiteBooking siteBooking : siteBookings) {
String[] split = siteBooking.getTimes().split(";");
@@ -1042,9 +1046,7 @@
}
System.out.println("======strings======="+strings);
-
List<OrderDto> timeRanges = new ArrayList<>();
-
Site site = siteClient.listById(id);
System.out.println("================"+site);
@@ -1059,8 +1061,6 @@
}else {
nextTime= getNextTime(currentTime);
}
-// String nextTime = getNextTime(currentTime);
-
String timeRange = currentTime + "-" + nextTime;
OrderDto orderDto = new OrderDto();
@@ -1084,6 +1084,10 @@
System.out.println("-------------"+timeRanges);
return timeRanges;
+
+
+
+
}
--
Gitblit v1.7.1