From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
index 795cba5..c9e983f 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
@@ -4,9 +4,9 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.BusinessOverDTO;
@@ -58,14 +58,16 @@
@ApiOperation(value = "褰撴湀浼氳琛�", notes = "褰撴湀浼氳琛�")
@GetMapping("/monthMeeting")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "骞存湀 yyyy-MM", required = true)
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "骞存湀 yyyy-MM", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "queryType", value = "鏌ヨ绫诲埆锛�1=鎴戝弬涓庣殑锛�2=鎴戦绾︾殑锛�3绠＄悊鍛樻煡鐪嬪叏閮� ", required = true)
})
public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth
+ ,@RequestParam(required = false) Integer queryType
,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = getLoginUser(token);
List<String> dataList = DateUtil.getDayByMonth(yearMonth);
List<MonthDataResponse> monthDataResponseList = new ArrayList<>();
- List<Bookings> bookings = bookingsService.getMyBookings(user.getId(),yearMonth);
+ List<Bookings> bookings = bookingsService.getMyBookings(user.getId(),yearMonth,queryType);
for (String str:dataList) {
MonthDataResponse monthDataResponse = new MonthDataResponse();
monthDataResponse.setWeekMsg(DateUtil.getWeek(DateUtil.StringToDate(str,"yyyy-MM-dd")).getChineseName());
@@ -93,8 +95,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
- public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
+ public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
}
--
Gitblit v1.9.3