From 6d519474e44855682043d3c40db2c86a6822caca Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期三, 24 九月 2025 19:37:59 +0800
Subject: [PATCH] 修改员工和评委的设置
---
backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRatingItem.java | 190 +++++++++++++++++++++++-----------------------
1 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRatingItem.java b/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRatingItem.java
index 51405b1..de62b2e 100644
--- a/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRatingItem.java
+++ b/backend/src/main/java/com/rongyichuang/activity/entity/ActivityPlayerRatingItem.java
@@ -14,10 +14,46 @@
public class ActivityPlayerRatingItem extends BaseEntity {
/**
+ * 娲诲姩ID
+ */
+ @Column(name = "activity_id", nullable = false)
+ private Long activityId;
+
+ /**
+ * 娲诲姩閫夋墜ID
+ */
+ @Column(name = "activity_player_id", nullable = false)
+ private Long activityPlayerId;
+
+ /**
* 娲诲姩閫夋墜璇勫垎ID锛堝叧鑱攖_activity_player_rating琛級
*/
@Column(name = "activity_player_rating_id", nullable = false)
private Long activityPlayerRatingId;
+
+ /**
+ * 闃舵ID
+ */
+ @Column(name = "stage_id", nullable = false)
+ private Long stageId;
+
+ /**
+ * 閫夋墜ID
+ */
+ @Column(name = "player_id", nullable = false)
+ private Long playerId;
+
+ /**
+ * 璇勫ID
+ */
+ @Column(name = "judge_id", nullable = false)
+ private Long judgeId;
+
+ /**
+ * 璇勫垎鏂规ID
+ */
+ @Column(name = "rating_scheme_id", nullable = false)
+ private Long ratingSchemeId;
/**
* 璇勫垎椤笽D锛堝叧鑱攖_rating_item琛級
@@ -26,66 +62,89 @@
private Long ratingItemId;
/**
- * 璇勫垎椤瑰悕绉帮紙鍐椾綑瀛楁锛屼究浜庢煡璇級
- */
- @Column(name = "rating_item_name", length = 100)
- private String ratingItemName;
-
- /**
- * 璇勫垎椤规潈閲嶏紙鍐椾綑瀛楁锛屼究浜庤绠楋級
- */
- @Column(name = "weight", precision = 5, scale = 2)
- private BigDecimal weight;
-
- /**
- * 璇勫垎椤规弧鍒嗭紙鍐椾綑瀛楁锛屼究浜庤绠楋級
- */
- @Column(name = "max_score", precision = 10, scale = 2)
- private BigDecimal maxScore;
-
- /**
* 瀹為檯寰楀垎
*/
@Column(name = "score", precision = 10, scale = 2, nullable = false)
private BigDecimal score;
/**
- * 鍔犳潈寰楀垎锛坰core * weight锛�
+ * 澶囨敞
*/
- @Column(name = "weighted_score", precision = 10, scale = 2)
- private BigDecimal weightedScore;
-
- /**
- * 璇勫垎澶囨敞
- */
- @Column(name = "remark", length = 500)
+ @Column(name = "feedback", columnDefinition = "TEXT")
private String remark;
// 鏋勯�犲嚱鏁�
public ActivityPlayerRatingItem() {}
- public ActivityPlayerRatingItem(Long activityPlayerRatingId, Long ratingItemId,
- String ratingItemName, BigDecimal weight,
- BigDecimal maxScore, BigDecimal score) {
+ public ActivityPlayerRatingItem(Long activityId, Long activityPlayerId, Long activityPlayerRatingId,
+ Long stageId, Long playerId, Long judgeId, Long ratingSchemeId,
+ Long ratingItemId, BigDecimal score) {
+ this.activityId = activityId;
+ this.activityPlayerId = activityPlayerId;
this.activityPlayerRatingId = activityPlayerRatingId;
+ this.stageId = stageId;
+ this.playerId = playerId;
+ this.judgeId = judgeId;
+ this.ratingSchemeId = ratingSchemeId;
this.ratingItemId = ratingItemId;
- this.ratingItemName = ratingItemName;
- this.weight = weight;
- this.maxScore = maxScore;
this.score = score;
- // 璁＄畻鍔犳潈寰楀垎
- if (score != null && weight != null) {
- this.weightedScore = score.multiply(weight);
- }
}
// Getter鍜孲etter鏂规硶
+ public Long getActivityId() {
+ return activityId;
+ }
+
+ public void setActivityId(Long activityId) {
+ this.activityId = activityId;
+ }
+
+ public Long getActivityPlayerId() {
+ return activityPlayerId;
+ }
+
+ public void setActivityPlayerId(Long activityPlayerId) {
+ this.activityPlayerId = activityPlayerId;
+ }
+
public Long getActivityPlayerRatingId() {
return activityPlayerRatingId;
}
public void setActivityPlayerRatingId(Long activityPlayerRatingId) {
this.activityPlayerRatingId = activityPlayerRatingId;
+ }
+
+ public Long getStageId() {
+ return stageId;
+ }
+
+ public void setStageId(Long stageId) {
+ this.stageId = stageId;
+ }
+
+ public Long getPlayerId() {
+ return playerId;
+ }
+
+ public void setPlayerId(Long playerId) {
+ this.playerId = playerId;
+ }
+
+ public Long getJudgeId() {
+ return judgeId;
+ }
+
+ public void setJudgeId(Long judgeId) {
+ this.judgeId = judgeId;
+ }
+
+ public Long getRatingSchemeId() {
+ return ratingSchemeId;
+ }
+
+ public void setRatingSchemeId(Long ratingSchemeId) {
+ this.ratingSchemeId = ratingSchemeId;
}
public Long getRatingItemId() {
@@ -96,48 +155,12 @@
this.ratingItemId = ratingItemId;
}
- public String getRatingItemName() {
- return ratingItemName;
- }
-
- public void setRatingItemName(String ratingItemName) {
- this.ratingItemName = ratingItemName;
- }
-
- public BigDecimal getWeight() {
- return weight;
- }
-
- public void setWeight(BigDecimal weight) {
- this.weight = weight;
- // 閲嶆柊璁＄畻鍔犳潈寰楀垎
- updateWeightedScore();
- }
-
- public BigDecimal getMaxScore() {
- return maxScore;
- }
-
- public void setMaxScore(BigDecimal maxScore) {
- this.maxScore = maxScore;
- }
-
public BigDecimal getScore() {
return score;
}
public void setScore(BigDecimal score) {
this.score = score;
- // 閲嶆柊璁＄畻鍔犳潈寰楀垎
- updateWeightedScore();
- }
-
- public BigDecimal getWeightedScore() {
- return weightedScore;
- }
-
- public void setWeightedScore(BigDecimal weightedScore) {
- this.weightedScore = weightedScore;
}
public String getRemark() {
@@ -148,36 +171,13 @@
this.remark = remark;
}
- /**
- * 鏇存柊鍔犳潈寰楀垎
- */
- private void updateWeightedScore() {
- if (score != null && weight != null) {
- this.weightedScore = score.multiply(weight);
- }
- }
-
- /**
- * 璁＄畻寰楀垎鐜囷紙瀹為檯寰楀垎/婊″垎锛�
- */
- public BigDecimal getScoreRate() {
- if (score != null && maxScore != null && maxScore.compareTo(BigDecimal.ZERO) > 0) {
- return score.divide(maxScore, 4, BigDecimal.ROUND_HALF_UP);
- }
- return BigDecimal.ZERO;
- }
-
@Override
public String toString() {
return "ActivityPlayerRatingItem{" +
"id=" + getId() +
", activityPlayerRatingId=" + activityPlayerRatingId +
", ratingItemId=" + ratingItemId +
- ", ratingItemName='" + ratingItemName + '\'' +
- ", weight=" + weight +
- ", maxScore=" + maxScore +
", score=" + score +
- ", weightedScore=" + weightedScore +
", remark='" + remark + '\'' +
'}';
}
--
Gitblit v1.8.0