Merge remote-tracking branch 'origin/master'

jiangping

2024-12-20 53b6400ec10c8ca61ccec91c82c358d2488eead8

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java

@@ -17,6 +17,7 @@
import com.doumee.dao.web.response.DateTimeResourceDate;
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.RoomDetailResponse;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDateTime;
@@ -142,7 +143,7 @@
     * @param id
     * @return
     */
    MeetingDetailResponse getMeetingDetail(Integer id);
    MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);

    /**
     * 根据日期和会议室主键查询占用信息
@@ -166,8 +167,6 @@

    /**
     * 会议预约记录取消
     * @param id
     * @param userId
     */
    void reservationCancel(BusinessOverDTO businessOverDTO);

@@ -210,4 +209,10 @@
    IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap);

    void reservationOver(BusinessOverDTO businessOverDTO);

    void start(BusinessOverDTO businessOverDTO);

    void startEarly(BusinessOverDTO businessOverDTO);

    RoomDetailResponse getRoomDetail(Integer roomId);
}