From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomTimeServiceImpl.java | 9 +++------
1 files changed, 3 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 7a608f2..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;
@@ -149,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