From 8470e06b5ce5189162f9f6cd3f2cea7d14ad80af Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 10:37:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
index f4b43de..4591ccc 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java
@@ -1,14 +1,12 @@
package com.doumee.service.business.impl;
-import cn.hutool.core.io.unit.DataUnit;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.BookingTimeMapper;
import com.doumee.dao.business.RoomTimeMapper;
import com.doumee.dao.business.join.BookingTimeJoinMapper;
import com.doumee.dao.business.join.BookingsJoinMapper;
@@ -16,7 +14,6 @@
import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.business.model.RoomTime;
-import com.doumee.dao.business.model.Rooms;
import com.doumee.dao.web.request.RoomTimeRequest;
import com.doumee.service.business.RoomTimeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -127,6 +124,7 @@
bookquery.selectAs(BookingTime::getTimeId, Bookings::getRoomTimeId);
bookquery.selectAs(BookingTime::getId, Bookings::getBookingTimeId);
bookquery.eq(Bookings::getIsdeleted, Constants.ZERO);
+ bookquery.eq(BookingTime::getIsdeleted, Constants.ZERO);
bookquery.eq(Bookings::getRoomId, roomTime.getRoomId());
bookquery.eq(Bookings::getStatus,Constants.ZERO);
bookquery.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT('" + DateUtil.dateToString(roomTime.getYudingDate(), "yyyy-MM-dd") + "','%Y-%m-%d') ");
@@ -148,7 +146,7 @@
RoomTime s = list.get(i);
s.setIsUse(false);
s.setIsChoose(false);
- String now = format.format(roomTime.getYudingDate())+" "+s.getStartTime()+":00";
+ String now = format.format(roomTime.getYudingDate())+" "+s.getEndTime()+":00";
try {
Date com=format1.parse(now);
if(flag){
--
Gitblit v1.9.3