From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +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 | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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..4f92c34 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
@@ -4,16 +4,20 @@
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;
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 com.doumee.dao.web.response.RoomDetailResponse;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
@@ -139,8 +143,14 @@
* @param id
* @return
*/
- MeetingDetailResponse getMeetingDetail(Integer id);
+ MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);
+ /**
+ * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅
+ * @param bean
+ * @return
+ */
+ MeetingDetailResponse getMeetingDetailByDate(Bookings bean);
/**
* 鑾峰彇浼氳浜岀淮鐮�
* @param id
@@ -157,10 +167,8 @@
/**
* 浼氳棰勭害璁板綍鍙栨秷
- * @param id
- * @param userId
*/
- void reservationCancel(Integer id,Integer userId);
+ void reservationCancel(BusinessOverDTO businessOverDTO);
/**
@@ -197,4 +205,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