From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 ea1bcb6..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
@@ -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());
--
Gitblit v1.9.3