Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

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

@@ -4,6 +4,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.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;
@@ -16,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;
@@ -141,7 +143,7 @@
     * @param id
     * @return
     */
    MeetingDetailResponse getMeetingDetail(Integer id);
    MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);

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

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


    /**
@@ -207,4 +207,12 @@
    void sendBookingsNotice();

    IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap);

    void reservationOver(BusinessOverDTO businessOverDTO);

    void start(BusinessOverDTO businessOverDTO);

    void startEarly(BusinessOverDTO businessOverDTO);

    RoomDetailResponse getRoomDetail(Integer roomId);
}