From 93eb6b470773bc49ea6e1a9d4cbd914eb95d525b Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期二, 30 九月 2025 17:38:04 +0800
Subject: [PATCH] feat: 完善比赛晋级功能并清理测试文件
---
backend/src/main/java/com/rongyichuang/activity/dto/ActivityResponse.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/backend/src/main/java/com/rongyichuang/activity/dto/ActivityResponse.java b/backend/src/main/java/com/rongyichuang/activity/dto/ActivityResponse.java
index f200f67..7673ca3 100644
--- a/backend/src/main/java/com/rongyichuang/activity/dto/ActivityResponse.java
+++ b/backend/src/main/java/com/rongyichuang/activity/dto/ActivityResponse.java
@@ -19,6 +19,7 @@
private String address;
private Long ratingSchemeId;
private Integer playerMax;
+ private Integer sortOrder;
private Integer state;
private LocalDateTime createTime;
private LocalDateTime updateTime;
@@ -27,6 +28,7 @@
private RatingSchemeResponse ratingScheme;
private List<ActivityResponse> stages;
private ActivityResponse parent;
+ private List<ActivityJudgeResponse> judges; // 璇勫鍒楄〃
// 缁熻鏁版嵁
private Integer playerCount = 0; // 鎶ュ悕浜烘暟锛堝疄闄呬汉鏁帮級
@@ -51,6 +53,7 @@
this.address = activity.getAddress();
this.ratingSchemeId = activity.getRatingSchemeId();
this.playerMax = activity.getPlayerMax();
+ this.sortOrder = activity.getSortOrder();
this.state = activity.getState();
this.createTime = activity.getCreateTime();
this.updateTime = activity.getUpdateTime();
@@ -58,11 +61,9 @@
// 璁剧疆鐘舵�佸悕绉�
this.stateName = getStateNameByValue(activity.getState());
- // 璁剧疆鍏宠仈鏁版嵁锛堜粎娴呮槧灏勮瘎鍒嗘ā鏉匡紝閬垮厤浠讳綍灞傜骇鐨勬椿鍔ㄩ�掑綊锛�
- if (activity.getRatingScheme() != null) {
- this.ratingScheme = new RatingSchemeResponse(activity.getRatingScheme());
- }
- // 鏄庣‘涓嶅湪DTO鏋勯�犱腑濉厖stages鍜宲arent锛岄伩鍏嶉�掑綊涓庢噿鍔犺浇鐜矾
+ // 閬垮厤璁块棶鎳掑姞杞界殑鍏宠仈鍏崇郴锛岄槻姝㈠湪娌℃湁娲昏穬Hibernate浼氳瘽鏃跺嚭鐜板紓甯�
+ // 濡傛灉闇�瑕乺atingScheme淇℃伅锛屽簲璇ュ湪Service灞傚崟鐙鐞�
+ this.ratingScheme = null;
this.stages = null;
this.parent = null;
}
@@ -159,6 +160,14 @@
this.playerMax = playerMax;
}
+ public Integer getSortOrder() {
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer sortOrder) {
+ this.sortOrder = sortOrder;
+ }
+
public Integer getState() {
return state;
}
@@ -223,8 +232,16 @@
this.stateName = stateName;
}
+ public List<ActivityJudgeResponse> getJudges() {
+ return judges;
+ }
+
+ public void setJudges(List<ActivityJudgeResponse> judges) {
+ this.judges = judges;
+ }
+
// 涓氬姟鏂规硶
- public boolean isCompetition() {
+ public boolean isMainActivity() {
return pid == 0;
}
--
Gitblit v1.8.0