From 1e790795f4e2c365f604ecc0fc1b290e3ff3c35f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 20 十月 2023 09:34:22 +0800
Subject: [PATCH] 更新bug
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 d9fa53c..b7f4243 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.other.entity.*;
@@ -246,11 +247,7 @@
}
}
-
-
}
-
-
}
System.out.println("======strings======="+strings);
@@ -266,7 +263,7 @@
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
String nextTime=null;
- if("智慧球场".equals(site.getTypeName())){
+ if("智慧场地".equals(site.getTypeName())){
nextTime=getNextTimeOne(currentTime);
}else {
nextTime= getNextTime(currentTime);
@@ -285,9 +282,23 @@
// orderDto.setSelectable(0);
// }
if (strings.contains(timeRange)){
+
orderDto.setSelectable(0);
}else {
+
+ String stime = day+" "+currentTime;
+ String etime = day+" "+nextTime;
orderDto.setSelectable(1);
+ // 查出lock
+ List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+ for (SiteLock siteLock : list) {
+ boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+ if(stringDateBetween){
+ orderDto.setSelectable(0);
+ }
+ }
+
+
}
@@ -297,8 +308,6 @@
System.out.println("-------------"+timeRanges);
return timeRanges;
-
-
--
Gitblit v1.7.1