diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/meeting/MeetingBookingSaveDto.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/meeting/MeetingBookingSaveDto.java new file mode 100644 index 000000000..0f4313050 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/meeting/MeetingBookingSaveDto.java @@ -0,0 +1,25 @@ +package com.bsd.pjcloud.integrated.dto.meeting; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class MeetingBookingSaveDto { + @Schema(description = "会议主题") + private String title; + + @Schema(description = "会议室id") + private Long roomId; + + @Schema(description = "会议说明") + private String description; + + @Schema(description = "预约日期,格式yyyy-MM-dd") + private String bookingDate; + + @Schema(description = "开始时间,格式HH:mm") + private String startTime; + + @Schema(description = "结束时间,格式HH:mm") + private String endTime; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/feedback/FeedbackScreenVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/feedback/FeedbackScreenVo.java new file mode 100644 index 000000000..af6e5e483 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/feedback/FeedbackScreenVo.java @@ -0,0 +1,17 @@ +package com.bsd.pjcloud.integrated.vo.feedback; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class FeedbackScreenVo { + @Schema(description = "标题") + private String title; + + @Schema(description = "反馈类型(中文)") + private String typeLabel; + + @Schema(description = "反馈时间") + private LocalDateTime createTime; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/lostandfound/LostAndFoundScreenVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/lostandfound/LostAndFoundScreenVo.java new file mode 100644 index 000000000..8596c9e01 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/lostandfound/LostAndFoundScreenVo.java @@ -0,0 +1,17 @@ +package com.bsd.pjcloud.integrated.vo.lostandfound; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.time.LocalDate; + +@Data +public class LostAndFoundScreenVo { + @Schema(description = "标题") + private String title; + + @Schema(description = "发现地点") + private String foundLocation; + + @Schema(description = "发现日期") + private LocalDate foundDate; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/maintenance/MaintenanceOrderScreenVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/maintenance/MaintenanceOrderScreenVo.java new file mode 100644 index 000000000..911b92f95 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/maintenance/MaintenanceOrderScreenVo.java @@ -0,0 +1,20 @@ +package com.bsd.pjcloud.integrated.vo.maintenance; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.time.LocalDate; + +@Data +public class MaintenanceOrderScreenVo { + @Schema(description = "标题") + private String title; + + @Schema(description = "发现日期") + private LocalDate dateFound; + + @Schema(description = "发现地点") + private String location; + + @Schema(description = "紧急程度(中文)") + private String urgencyLabel; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/MeetingBookingPageVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/MeetingBookingPageVo.java new file mode 100644 index 000000000..c089a6306 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/meeting/MeetingBookingPageVo.java @@ -0,0 +1,52 @@ +package com.bsd.pjcloud.integrated.vo.meeting; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; + +@Data +public class MeetingBookingPageVo { + @Schema(description = "预约ID") + private Long id; + + @Schema(description = "会议主题") + private String title; + + @Schema(description = "会议室id") + private Long roomId; + + @Schema(description = "会议室名称") + private String roomName; + + @Schema(description = "预约日期") + private LocalDate bookingDate; + + @Schema(description = "开始时间") + private LocalTime startTime; + + @Schema(description = "结束时间") + private LocalTime endTime; + + @Schema(description = "预约人ID") + private Long applicantId; + + @Schema(description = "预约人") + private String assigneeName; + + @Schema(description = "状态") + private String checkStatus; + + @Schema(description = "描述") + private String description; + + @Schema(description = "创建人") + private String createBy; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "审核原因") + private String checkReason; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/notice/NoticeScreenVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/notice/NoticeScreenVo.java new file mode 100644 index 000000000..6a97f07fa --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/notice/NoticeScreenVo.java @@ -0,0 +1,20 @@ +package com.bsd.pjcloud.integrated.vo.notice; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.time.LocalDateTime; + +@Data +public class NoticeScreenVo { + @Schema(description = "标题") + private String title; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + /** + * 公告详情 + */ + @Schema(description="公告详情") + private String description; +} \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java index 8b5b3d758..1a12702f3 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/NoticeController.java @@ -187,6 +187,7 @@ public class NoticeController { NoticeScreenVo vo = new NoticeScreenVo(); vo.setTitle(e.getTitle()); vo.setCreateTime(e.getCreateTime()); + vo.setDescription(e.getDescription()); return vo; }).collect(Collectors.toList()); return R.ok(voList);