From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 26 十二月 2024 09:53:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 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..bf35220 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 @@ -127,6 +127,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 +149,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