diff --git a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java index a9faa19..d4ada8c 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -521,6 +521,12 @@ public class MartialMiniController extends BladeController { // 只有评分完成时才显示总分 if (scoringComplete) { vo.setTotalScore(athlete.getTotalScore()); + + // 使用数据库中保存的修改前分数 + if (athlete.getPreviousScore() != null) { + vo.setOriginalScore(athlete.getPreviousScore()); + vo.setIsModified(true); + } } else { vo.setTotalScore(null); } diff --git a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialAthlete.java b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialAthlete.java index ec16b0c..07cb18f 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialAthlete.java +++ b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialAthlete.java @@ -176,6 +176,12 @@ public class MartialAthlete extends TenantEntity { @Schema(description = "总分") private BigDecimal totalScore; + /** + * 修改前分数 + */ + @Schema(description = "修改前分数") + private BigDecimal previousScore; + /** * 排名 */ diff --git a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteListVO.java b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteListVO.java index 95cc266..81dee96 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteListVO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteListVO.java @@ -78,6 +78,14 @@ public class MiniAthleteListVO implements Serializable { @JsonProperty("scoringComplete") private Boolean scoringComplete = false; + @Schema(description = "修改前分数(普通裁判评分的平均分)") + @JsonProperty("originalScore") + private BigDecimal originalScore; + + @Schema(description = "是否被主裁判修改过") + @JsonProperty("isModified") + private Boolean isModified = false; + @Schema(description = "比赛状态(0-待出场,1-进行中,2-已完成)") @JsonProperty("competitionStatus") private Integer competitionStatus; diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScoreServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScoreServiceImpl.java index 1fdcf69..5501b77 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScoreServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScoreServiceImpl.java @@ -370,7 +370,8 @@ public class MartialScoreServiceImpl extends ServiceImpl