From dc7a8e66aca0da614e9793da473b03cc0e2e3451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= <hongjianli_email@126.com>
Date: Sat, 24 Jan 2026 12:20:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=B8=BB=E8=A3=81?=
 =?UTF-8?q?=E5=88=A4=E5=A4=9A=E6=AC=A1=E4=BF=AE=E6=94=B9=E5=88=86=E6=95=B0?=
 =?UTF-8?q?=E5=B9=B6=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=E5=89=8D=E5=90=8E?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Flyway V8: 添加previous_score字段
- 修改前保存当前分数到previousScore
- 前端显示修改前和最终得分

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
---
 .../modules/martial/controller/MartialMiniController.java | 6 ++++++
 .../modules/martial/pojo/entity/MartialAthlete.java       | 6 ++++++
 .../modules/martial/pojo/vo/MiniAthleteListVO.java        | 8 ++++++++
 .../martial/service/impl/MartialScoreServiceImpl.java     | 3 ++-
 .../db/migration/V8__add_athlete_previous_score.sql       | 2 ++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/db/migration/V8__add_athlete_previous_score.sql

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<MartialScoreMapper, Mar
 			}
 		}
 
-		// 6. 更新选手总分
+		// 6. 保存修改前分数，然后更新选手总分
+		athlete.setPreviousScore(athlete.getTotalScore());
 		athlete.setTotalScore(dto.getModifiedScore());
 		boolean athleteUpdated = athleteService.updateById(athlete);
 
diff --git a/src/main/resources/db/migration/V8__add_athlete_previous_score.sql b/src/main/resources/db/migration/V8__add_athlete_previous_score.sql
new file mode 100644
index 0000000..50fff64
--- /dev/null
+++ b/src/main/resources/db/migration/V8__add_athlete_previous_score.sql
@@ -0,0 +1,2 @@
+-- 添加选手修改前分数字段，用于记录主裁判修改前的分数
+ALTER TABLE martial_athlete ADD COLUMN previous_score DECIMAL(10,3) DEFAULT NULL COMMENT '修改前分数' AFTER total_score;