From 783b9ee7a8caa508d123d34bfbbf294716211dd7 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 16:50:16 +0800
Subject: [PATCH] 10.18.2
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 5065796..fbb18c6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -167,7 +167,7 @@
* @throws Exception
*/
@Override
- public List<QuerySiteTimes> querySiteTimes(Integer id, String day) throws Exception {
+ public List<QuerySiteTimes> querySiteTimes(Integer id, String day,String halfName,String siteName) throws Exception {
// Site site = this.getById(id);
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
// Calendar s = Calendar.getInstance();
@@ -224,15 +224,31 @@
List<String> strings = new ArrayList<>();
// List<SiteBooking> siteBookings = siteClient.listBooks(id);
- List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).like("times",day));
+ List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).eq("nextName",siteName).like("times",day));
System.out.println("=======siteBookings======"+siteBookings);
for (SiteBooking siteBooking : siteBookings) {
- String[] split = siteBooking.getTimes().split(";");
- for (String s : split) {
- String convertedValue = s.substring(11);
- strings.add(convertedValue);
+
+ String[] split = siteBooking.getTimes().split(";");
+
+ if (siteBooking.getIsHalf() == 2) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue);
+ }
+ }else {
+
+ if (siteBooking.getHalfName().equals(halfName)){
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue);
+ }
+
+ }
+
+
}
+
}
System.out.println("======strings======="+strings);
@@ -249,8 +265,6 @@
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
String nextTime = getNextTime(currentTime);
-
-
String timeRange = currentTime + "-" + nextTime;
QuerySiteTimes orderDto = new QuerySiteTimes();
orderDto.setTime(timeRange);
@@ -264,6 +278,8 @@
// }
if (strings.contains(timeRange)){
orderDto.setSelectable(0);
+ }else {
+ orderDto.setSelectable(1);
}
@@ -331,7 +347,7 @@
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
- List<QuerySiteTimes> querySiteTimes = querySiteTimes(reservationSite.getId(), day);
+ List<QuerySiteTimes> querySiteTimes = querySiteTimes(reservationSite.getId(), day,reservationSite.getHalfName(),reservationSite.getNextName());
for (QuerySiteTimes querySiteTime : querySiteTimes) {
if(querySiteTime.getTime().equals(time) && querySiteTime.getSelectable() == 0){
return ResultUtil.error("【" + s + "】时间段已被使用");
--
Gitblit v1.7.1