From bc2cda03481cd62a1b04959d2653678053e60b18 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 31 五月 2024 18:23:35 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 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 fec87ee..40450f7 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 @@ -8,9 +8,11 @@ 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; @@ -142,6 +144,12 @@ MeetingDetailResponse getMeetingDetail(Integer id); /** + * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅 + * @param bean + * @return + */ + MeetingDetailResponse getMeetingDetailByDate(Bookings bean); + /** * 鑾峰彇浼氳浜岀淮鐮� * @param id * @param userId @@ -197,4 +205,6 @@ PageData<UserStatisticsVo> getUserStatistics(PageWrap<UserStatisticsDTO> pageWrap); void sendBookingsNotice(); + + IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap); } -- Gitblit v1.9.3