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 |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 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 f22d92f..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,22 +1,25 @@
 package com.doumee.service.business;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-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;
 
 /**
@@ -39,21 +42,21 @@
      *
      * @param id 涓婚敭
      */
-    void deleteById(Integer id);
+    void deleteById(Integer id,LoginUserInfo user);
 
     /**
      * 鍒犻櫎
      *
      * @param bookings 瀹炰綋瀵硅薄
      */
-    void delete(Bookings bookings);
+    void delete(Bookings bookings,LoginUserInfo user);
 
     /**
      * 鎵归噺涓婚敭鍒犻櫎
      *
      * @param ids 涓婚敭闆�
      */
-    void deleteByIdInBatch(List<Integer> ids);
+    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);
 
     /**
      * 涓婚敭鏇存柊
@@ -122,7 +125,7 @@
      * @param dateMsg
      * @return
      */
-    List<Bookings> getMyBookings(Integer userId,String dateMsg);
+    List<Bookings> getMyBookings(Integer userId,String dateMsg,Integer queryType);
 
 
     /**
@@ -138,8 +141,14 @@
      * @param id
      * @return
      */
-    MeetingDetailResponse getMeetingDetail(Integer id);
+    MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);
 
+    /**
+     * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅
+     * @param bean
+     * @return
+     */
+    MeetingDetailResponse getMeetingDetailByDate(Bookings bean);
     /**
      * 鑾峰彇浼氳浜岀淮鐮�
      * @param id
@@ -156,10 +165,8 @@
 
     /**
      * 浼氳棰勭害璁板綍鍙栨秷
-     * @param id
-     * @param userId
      */
-    void reservationCancel(Integer id,Integer userId);
+    void reservationCancel(BusinessOverDTO businessOverDTO);
 
 
     /**
@@ -196,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