From c4a9cad1c50e89365e2a58b50e259af642ed3b8c Mon Sep 17 00:00:00 2001 From: Codex Assistant <codex@example.com> Date: 星期二, 07 十月 2025 16:12:20 +0800 Subject: [PATCH] feat(review): 调整评审详情展示顺序与样式,描述支持多行,项目信息列宽40/60 fix(auth): 登录页与首页循环跳转保护;api.ts 在登录页不再重定向;401分支在登录页不跳转 fix(router): /login 放行策略优化,避免死循环;评审列表跳转到 /project-review/:id/detail fix(frontend): 补齐 utils/appConfig.ts,避免启动白屏 fix(review): 详情页提交评分缺少stageId时回退使用项目详情的stageId feat(backend): ActivityPlayerDetailResponse.playerInfo 补充 avatarUrl/avatar,服务组装时填充用户头像 chore(dev): 启动脚本注入本地JWT密钥,重启前后端 --- backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRating.java | 64 +++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 21 deletions(-) diff --git a/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRating.java b/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRating.java index 99b1d5d..7977978 100644 --- a/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRating.java +++ b/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRating.java @@ -2,6 +2,7 @@ import com.rongyichuang.common.entity.BaseEntity; import jakarta.persistence.*; +import org.hibernate.annotations.Where; import java.math.BigDecimal; @@ -11,6 +12,7 @@ */ @Entity @Table(name = "t_activity_player_rating") +@Where(clause = "state = 1") public class ActivityPlayerRating extends BaseEntity { /** @@ -26,6 +28,12 @@ private Long activityPlayerId; /** + * 闃舵ID + */ + @Column(name = "stage_id", nullable = false) + private Long stageId; + + /** * 閫夋墜ID */ @Column(name = "player_id", nullable = false) @@ -34,44 +42,47 @@ /** * 璇勫ID */ - @Column(name = "judge_id", nullable = false) + @Column(name = "judge_id") private Long judgeId; /** * 璇勫垎鏂规ID */ - @Column(name = "rating_scheme_id", nullable = false) + @Column(name = "rating_scheme_id") private Long ratingSchemeId; /** * 鎬诲垎 */ - @Column(name = "total_score", precision = 10, scale = 2) + @Column(name = "total_score", precision = 19, scale = 2) private BigDecimal totalScore; /** - * 璇勫垎鐘舵�侊細0-鏈瘎鍒嗭紝1-宸茶瘎鍒� + * 鍙嶉淇℃伅 */ - @Column(name = "status", nullable = false) - private Integer status = 0; + @Column(name = "feedback", columnDefinition = "TEXT") + private String feedback; + + /** - * 璇勫垎澶囨敞 + * 鐘舵�侊細1-姝e父锛�0-鍒犻櫎 */ - @Column(name = "remark", length = 500) - private String remark; + @Column(name = "state", nullable = false) + private Integer state = 1; // 鏋勯�犲嚱鏁� public ActivityPlayerRating() {} - public ActivityPlayerRating(Long activityId, Long activityPlayerId, Long playerId, + public ActivityPlayerRating(Long activityId, Long activityPlayerId, Long stageId, Long playerId, Long judgeId, Long ratingSchemeId) { this.activityId = activityId; this.activityPlayerId = activityPlayerId; + this.stageId = stageId; this.playerId = playerId; this.judgeId = judgeId; this.ratingSchemeId = ratingSchemeId; - this.status = 0; + this.state = 0; } // Getter鍜孲etter鏂规硶 @@ -89,6 +100,14 @@ public void setActivityPlayerId(Long activityPlayerId) { this.activityPlayerId = activityPlayerId; + } + + public Long getStageId() { + return stageId; + } + + public void setStageId(Long stageId) { + this.stageId = stageId; } public Long getPlayerId() { @@ -123,20 +142,22 @@ this.totalScore = totalScore; } - public Integer getStatus() { - return status; + public String getFeedback() { + return feedback; } - public void setStatus(Integer status) { - this.status = status; + public void setFeedback(String feedback) { + this.feedback = feedback; } - public String getRemark() { - return remark; + + + public Integer getState() { + return state; } - public void setRemark(String remark) { - this.remark = remark; + public void setState(Integer state) { + this.state = state; } @Override @@ -145,12 +166,13 @@ "id=" + getId() + ", activityId=" + activityId + ", activityPlayerId=" + activityPlayerId + + ", stageId=" + stageId + ", playerId=" + playerId + ", judgeId=" + judgeId + ", ratingSchemeId=" + ratingSchemeId + ", totalScore=" + totalScore + - ", status=" + status + - ", remark='" + remark + '\'' + + ", feedback='" + feedback + '\'' + + ", state=" + state + '}'; } } \ No newline at end of file -- Gitblit v1.8.0