From 22e1feb290d3e63cc1ac40a6780bb641f0e4dca9 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sun, 3 Dec 2023 17:15:08 +0900 Subject: [PATCH] =?UTF-8?q?[PDS-73]=20fix:=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=20=EC=98=88=EC=95=BD=20=EB=82=B4=EC=97=AD=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C,=20=EC=9D=B4=EC=9A=A9?= =?UTF-8?q?=EB=AA=A9=EC=A0=81=20res=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pladialmserver/booking/dto/response/AdminBookingRes.java | 3 +++ .../pladialmserver/product/dto/response/AdminProductRes.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/example/pladialmserver/booking/dto/response/AdminBookingRes.java b/src/main/java/com/example/pladialmserver/booking/dto/response/AdminBookingRes.java index de26599c..de15d7ec 100644 --- a/src/main/java/com/example/pladialmserver/booking/dto/response/AdminBookingRes.java +++ b/src/main/java/com/example/pladialmserver/booking/dto/response/AdminBookingRes.java @@ -26,6 +26,8 @@ public class AdminBookingRes { private String reservatorName; @Schema(type = "String", description = "예약자 전화번호", example = "010-4158-8124") private String reservatorPhone; + @Schema(type = "String", description = "이용목적", example = "드라마 촬영") + private String memo; @Schema(type = "String", description = "상태", example = "'예약중' / '사용중'") private String status; @@ -39,6 +41,7 @@ public static AdminBookingRes toDto(OfficeBooking officeBooking){ .endDateTime(DateTimeUtil.dateAndTimeToString(officeBooking.getDate(),officeBooking.getEndTime())) .reservatorName(officeBooking.getUser().getName()) .reservatorPhone(officeBooking.getUser().getPhone()) + .memo(officeBooking.getMemo()) .status(officeBooking.getStatus().getValue()) .build(); } diff --git a/src/main/java/com/example/pladialmserver/product/dto/response/AdminProductRes.java b/src/main/java/com/example/pladialmserver/product/dto/response/AdminProductRes.java index 09ac0160..4f9fc6c8 100644 --- a/src/main/java/com/example/pladialmserver/product/dto/response/AdminProductRes.java +++ b/src/main/java/com/example/pladialmserver/product/dto/response/AdminProductRes.java @@ -26,6 +26,8 @@ public class AdminProductRes { private String reservatorName; @Schema(type = "String", description = "예약자 전화번호", example = "010-0000-0000") private String reservatorPhone; + @Schema(type = "String", description = "이용목적", example = "드라마 촬영") + private String memo; @Schema(type = "String", description = "상태", example = "'예약중' / '사용중'") private String status; @@ -39,6 +41,7 @@ public static AdminProductRes toDto(ResourceBooking resourceBooking){ .endDateTime(DateTimeUtil.dateTimeToString(resourceBooking.getEndDate())) .reservatorName(resourceBooking.getUser().getName()) .reservatorPhone(resourceBooking.getUser().getPhone()) + .memo(resourceBooking.getMemo()) .status(resourceBooking.getStatus().getValue()) .build(); } @@ -53,6 +56,7 @@ public static AdminProductRes toDto(CarBooking carBooking){ .endDateTime(DateTimeUtil.dateTimeToString(carBooking.getEndDate())) .reservatorName(carBooking.getUser().getName()) .reservatorPhone(carBooking.getUser().getPhone()) + .memo(carBooking.getMemo()) .status(carBooking.getStatus().getValue()) .build(); }