diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/activity/vo/AppActivityRegistrationRespVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/activity/vo/AppActivityRegistrationRespVO.java index a995d12..61c5310 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/activity/vo/AppActivityRegistrationRespVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/activity/vo/AppActivityRegistrationRespVO.java @@ -29,6 +29,18 @@ public class AppActivityRegistrationRespVO { @Schema(description = "报名状态(0-待审核,1-已通过,2-已拒绝,3-已取消)", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") private Integer status; + @Schema(description = "报名开始时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime registrationStartTime; + + @Schema(description = "报名结束时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime registrationEndTime; + + @Schema(description = "活动开始时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime activityStartTime; + + @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime activityEndTime; + @Schema(description = "报名时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime registrationTime; diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java index a6a0b78..6514f55 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java @@ -264,7 +264,7 @@ public class CommunityActivityServiceImpl implements CommunityActivityService { Map activityMap = activities.stream() .collect(Collectors.toMap(CommunityActivityDO::getId, activity -> activity)); - // 填充活动标题和封面 + // 填充活动信息 for (int i = 0; i < respVOPageResult.getList().size(); i++) { AppActivityRegistrationRespVO respVO = respVOPageResult.getList().get(i); ActivityRegistrationDO registration = pageResult.getList().get(i); @@ -272,6 +272,10 @@ public class CommunityActivityServiceImpl implements CommunityActivityService { if (activity != null) { respVO.setActivityTitle(activity.getTitle()); respVO.setActivityCoverImage(activity.getCoverImage()); + respVO.setRegistrationStartTime(activity.getRegistrationStartTime()); + respVO.setRegistrationEndTime(activity.getRegistrationEndTime()); + respVO.setActivityStartTime(activity.getActivityStartTime()); + respVO.setActivityEndTime(activity.getActivityEndTime()); } }