From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 16 一月 2025 16:52:46 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java index 7ea8a40..fdab03e 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java @@ -1,9 +1,9 @@ package com.doumee.service.business; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.doumee.core.model.LoginUserInfo; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.LoginUserInfo; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.dao.admin.request.BusinessOverDTO; import com.doumee.dao.admin.response.DevWgResponseParam; import com.doumee.dao.business.model.Bookings; @@ -17,10 +17,9 @@ import com.doumee.dao.web.response.DateTimeResourceDate; import com.doumee.dao.web.response.MeetingDetailResponse; import com.doumee.dao.web.response.MeetingListResponse; -import org.apache.ibatis.annotations.Param; +import com.doumee.dao.web.response.RoomDetailResponse; import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** @@ -126,7 +125,7 @@ * @param dateMsg * @return */ - List<Bookings> getMyBookings(Integer userId,String dateMsg); + List<Bookings> getMyBookings(Integer userId,String dateMsg,Integer queryType); /** @@ -142,7 +141,7 @@ * @param id * @return */ - MeetingDetailResponse getMeetingDetail(Integer id); + MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId); /** * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅 @@ -166,8 +165,6 @@ /** * 浼氳棰勭害璁板綍鍙栨秷 - * @param id - * @param userId */ void reservationCancel(BusinessOverDTO businessOverDTO); @@ -210,4 +207,10 @@ IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap); void reservationOver(BusinessOverDTO businessOverDTO); + + void start(BusinessOverDTO businessOverDTO); + + void startEarly(BusinessOverDTO businessOverDTO); + + RoomDetailResponse getRoomDetail(Integer roomId); } -- Gitblit v1.9.3