diff --git a/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java b/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java index ac8b169..7f85245 100644 --- a/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java +++ b/backend-java/src/main/java/com/competition/modules/biz/contest/service/impl/ContestServiceImpl.java @@ -128,19 +128,28 @@ public class ContestServiceImpl extends ServiceImpl i wrapper.eq(BizContest::getContestType, dto.getContestType()); } - // 阶段筛选 + // 阶段筛选(与前端活动列表「活动阶段」一致:unpublished/finished/registering/submitting/reviewing) if (StringUtils.hasText(dto.getStage())) { LocalDateTime now = LocalDateTime.now(); switch (dto.getStage()) { + case "unpublished": + wrapper.eq(BizContest::getContestState, PublishStatus.UNPUBLISHED.getValue()); + break; + case "finished": + wrapper.eq(BizContest::getStatus, "finished"); + break; case "registering": + wrapper.eq(BizContest::getContestState, PublishStatus.PUBLISHED.getValue()); wrapper.le(BizContest::getRegisterStartTime, now) .ge(BizContest::getRegisterEndTime, now); break; case "submitting": + wrapper.eq(BizContest::getContestState, PublishStatus.PUBLISHED.getValue()); wrapper.le(BizContest::getSubmitStartTime, now) .ge(BizContest::getSubmitEndTime, now); break; case "reviewing": + wrapper.eq(BizContest::getContestState, PublishStatus.PUBLISHED.getValue()); wrapper.le(BizContest::getReviewStartTime, now) .ge(BizContest::getReviewEndTime, now); break; diff --git a/frontend/src/views/contests/Index.vue b/frontend/src/views/contests/Index.vue index 665996d..159755a 100644 --- a/frontend/src/views/contests/Index.vue +++ b/frontend/src/views/contests/Index.vue @@ -151,12 +151,16 @@ 编辑 删除 - -