From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 6a56fb5..af18b8f 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,9 +1,9 @@
package com.doumee.service.business;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.doumee.core.model.LoginUserInfo;
-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;
@@ -18,10 +18,8 @@
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;
-import java.util.Date;
import java.util.List;
/**
@@ -127,7 +125,7 @@
* @param dateMsg
* @return
*/
- List<Bookings> getMyBookings(Integer userId,String dateMsg);
+ List<Bookings> getMyBookings(Integer userId,String dateMsg,Integer queryType);
/**
@@ -143,7 +141,7 @@
* @param id
* @return
*/
- MeetingDetailResponse getMeetingDetail(Integer id);
+ MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);
/**
* 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅
@@ -215,4 +213,7 @@
void startEarly(BusinessOverDTO businessOverDTO);
RoomDetailResponse getRoomDetail(Integer roomId);
+
+ void autoStart();
+
}
--
Gitblit v1.9.3