From 427036b9d4e76f1c38320f292cd36b5a5aa8e87d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 05 三月 2025 16:36:50 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 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 035d41f..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,23 +1,25 @@ 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; import com.doumee.dao.business.vo.RoomStatisticsVo; import com.doumee.dao.system.dto.UserStatisticsDTO; +import com.doumee.dao.system.vo.UserResponse; import com.doumee.dao.system.vo.UserStatisticsVo; import com.doumee.dao.web.request.BookingsRequest; import com.doumee.dao.web.request.MeetingPageRequest; +import com.doumee.dao.web.request.UserPageRequest; 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; /** @@ -123,7 +125,7 @@ * @param dateMsg * @return */ - List<Bookings> getMyBookings(Integer userId,String dateMsg); + List<Bookings> getMyBookings(Integer userId,String dateMsg,Integer queryType); /** @@ -139,7 +141,7 @@ * @param id * @return */ - MeetingDetailResponse getMeetingDetail(Integer id); + MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId); /** * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅 @@ -163,10 +165,8 @@ /** * 浼氳棰勭害璁板綍鍙栨秷 - * @param id - * @param userId */ - void reservationCancel(Integer id,Integer userId); + void reservationCancel(BusinessOverDTO businessOverDTO); /** @@ -203,4 +203,14 @@ PageData<UserStatisticsVo> getUserStatistics(PageWrap<UserStatisticsDTO> pageWrap); void sendBookingsNotice(); + + 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