Merge remote-tracking branch 'origin/master'

jiangping

2024-05-31 bf8d85d5f83c2036fb4239d764d33e99c1b62bd3

 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);
}