diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 71cbc96..55e0343 100644 Binary files a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta and b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta index c502e93..23e8788 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta index fc9d36f..7e1825f 100644 Binary files a/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/.usage.json/xl.meta b/minio_data/.minio.sys/buckets/.usage.json/xl.meta index 06e0a28..0b42404 100644 Binary files a/minio_data/.minio.sys/buckets/.usage.json/xl.meta and b/minio_data/.minio.sys/buckets/.usage.json/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta index 35ec0d5..cc7850a 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta index 3476bf1..40d9b94 100644 Binary files a/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/000000-assets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta index 739c568..cbf8d4a 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin.bkp/xl.meta differ diff --git a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta index 53ec5e6..81ee71f 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.usage-cache.bin/xl.meta differ diff --git a/minio_data/.minio.sys/tmp/.trash/09db7875-d2ac-4a28-9df6-d2bbc51978d3/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/09db7875-d2ac-4a28-9df6-d2bbc51978d3/xl.meta.bkp deleted file mode 100644 index 00398b4..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/09db7875-d2ac-4a28-9df6-d2bbc51978d3/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/10b26292-37a2-4c7c-8238-f9580ade0fa1/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/10b26292-37a2-4c7c-8238-f9580ade0fa1/xl.meta.bkp deleted file mode 100644 index 6cd5273..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/10b26292-37a2-4c7c-8238-f9580ade0fa1/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/1900243e-6a12-4cec-a4dc-8590e5f401b1/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/1900243e-6a12-4cec-a4dc-8590e5f401b1/xl.meta.bkp deleted file mode 100644 index 9167b0e..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/1900243e-6a12-4cec-a4dc-8590e5f401b1/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/1f5ece71-77e8-42f4-98f7-d9fee4357882/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/1f5ece71-77e8-42f4-98f7-d9fee4357882/xl.meta.bkp deleted file mode 100644 index 34c3fdd..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/1f5ece71-77e8-42f4-98f7-d9fee4357882/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/34ef52f5-b2e5-4791-b5d9-ba3f857489da/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/34ef52f5-b2e5-4791-b5d9-ba3f857489da/xl.meta.bkp deleted file mode 100644 index a51c49e..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/34ef52f5-b2e5-4791-b5d9-ba3f857489da/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/3c878783-9eec-44d5-9a74-ba411834f41c/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/3c878783-9eec-44d5-9a74-ba411834f41c/xl.meta.bkp deleted file mode 100644 index a33d7a0..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/3c878783-9eec-44d5-9a74-ba411834f41c/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/4759060a-9f18-4e23-9057-eee91fab2d0f/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/4759060a-9f18-4e23-9057-eee91fab2d0f/xl.meta.bkp deleted file mode 100644 index 177e0e0..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/4759060a-9f18-4e23-9057-eee91fab2d0f/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/4fe1ae47-76bd-415e-8345-ff69ed9e293a/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/4fe1ae47-76bd-415e-8345-ff69ed9e293a/xl.meta.bkp deleted file mode 100644 index 5fc4bd4..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/4fe1ae47-76bd-415e-8345-ff69ed9e293a/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/5112eaad-d07c-42d7-a538-810c3c51af28/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/5112eaad-d07c-42d7-a538-810c3c51af28/xl.meta.bkp deleted file mode 100644 index f8a022c..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/5112eaad-d07c-42d7-a538-810c3c51af28/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/54635a51-8476-4ff5-9038-4fd9914aa317/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/54635a51-8476-4ff5-9038-4fd9914aa317/xl.meta.bkp deleted file mode 100644 index 42676a0..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/54635a51-8476-4ff5-9038-4fd9914aa317/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/5d487f5e-9180-48f9-a951-56295b61f08f/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/5d487f5e-9180-48f9-a951-56295b61f08f/xl.meta.bkp deleted file mode 100644 index 6152e91..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/5d487f5e-9180-48f9-a951-56295b61f08f/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/5ea2b227-ad55-4373-8693-37907c88c9ba/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/5ea2b227-ad55-4373-8693-37907c88c9ba/xl.meta.bkp deleted file mode 100644 index 6235c39..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/5ea2b227-ad55-4373-8693-37907c88c9ba/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/6ca4e445-06e8-478c-bab9-d532144d75bf/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/6ca4e445-06e8-478c-bab9-d532144d75bf/xl.meta.bkp deleted file mode 100644 index fd0f575..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/6ca4e445-06e8-478c-bab9-d532144d75bf/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/7d4bcbc3-14d1-4018-b6c7-67f124c90665/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/7d4bcbc3-14d1-4018-b6c7-67f124c90665/xl.meta.bkp deleted file mode 100644 index 76221f4..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/7d4bcbc3-14d1-4018-b6c7-67f124c90665/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/901041fc-96c3-49f8-8dcb-2a9c13bc8af2/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/901041fc-96c3-49f8-8dcb-2a9c13bc8af2/xl.meta.bkp deleted file mode 100644 index f8a3765..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/901041fc-96c3-49f8-8dcb-2a9c13bc8af2/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/9505624f-6ccb-4d51-93dc-9d411387d812/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/9505624f-6ccb-4d51-93dc-9d411387d812/xl.meta.bkp deleted file mode 100644 index 8babb24..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/9505624f-6ccb-4d51-93dc-9d411387d812/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/9be5a224-7b55-471d-bf5a-265ec5ba8494/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/9be5a224-7b55-471d-bf5a-265ec5ba8494/xl.meta.bkp deleted file mode 100644 index c79b7fa..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/9be5a224-7b55-471d-bf5a-265ec5ba8494/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/a46cdf49-0002-4b17-9d25-3077337cd3fa/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/a46cdf49-0002-4b17-9d25-3077337cd3fa/xl.meta.bkp deleted file mode 100644 index df96263..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/a46cdf49-0002-4b17-9d25-3077337cd3fa/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/a974a135-9691-4cd5-a99d-9860e07eded3/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/a974a135-9691-4cd5-a99d-9860e07eded3/xl.meta.bkp deleted file mode 100644 index b154c39..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/a974a135-9691-4cd5-a99d-9860e07eded3/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/b75ffdbc-eaa2-4597-969e-dac9e8fa7d9a/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/b75ffdbc-eaa2-4597-969e-dac9e8fa7d9a/xl.meta.bkp deleted file mode 100644 index 7fb55b0..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/b75ffdbc-eaa2-4597-969e-dac9e8fa7d9a/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/dac0cdfc-309f-4448-8a14-dd737c7a5db4/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/dac0cdfc-309f-4448-8a14-dd737c7a5db4/xl.meta.bkp deleted file mode 100644 index 678a99e..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/dac0cdfc-309f-4448-8a14-dd737c7a5db4/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/e795a6fe-687a-4166-ac0d-b0a31a2cd0f0/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/e795a6fe-687a-4166-ac0d-b0a31a2cd0f0/xl.meta.bkp deleted file mode 100644 index 0e63179..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/e795a6fe-687a-4166-ac0d-b0a31a2cd0f0/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/f23a1b78-d937-472b-835c-afbfb87614a1/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/f23a1b78-d937-472b-835c-afbfb87614a1/xl.meta.bkp deleted file mode 100644 index 1bfe5e8..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/f23a1b78-d937-472b-835c-afbfb87614a1/xl.meta.bkp and /dev/null differ diff --git a/minio_data/.minio.sys/tmp/.trash/feb48d42-ba24-4e90-8e05-1e9a2fea66b0/xl.meta.bkp b/minio_data/.minio.sys/tmp/.trash/feb48d42-ba24-4e90-8e05-1e9a2fea66b0/xl.meta.bkp deleted file mode 100644 index c6e51ec..0000000 Binary files a/minio_data/.minio.sys/tmp/.trash/feb48d42-ba24-4e90-8e05-1e9a2fea66b0/xl.meta.bkp and /dev/null differ 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 abe8a64..6d3a357 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -199,18 +199,18 @@ public class MartialMiniController extends BladeController { */ private void updateAthleteTotalScore(Long athleteId, Long projectId, Long venueId) { try { - // 1. 查询该场地的普通裁判数量 + // 1. 查询该场地的裁判员数量 int requiredJudgeCount = getRequiredJudgeCount(projectId); - // 2. 获取裁判长ID列表 + // 2. 获取主裁判ID列表 List chiefJudgeIds = getChiefJudgeIds(venueId); - // 3. 查询该选手在该项目的所有评分（排除裁判长的评分） + // 3. 查询该选手在该项目的所有评分（排除主裁判的评分） LambdaQueryWrapper scoreQuery = new LambdaQueryWrapper<>(); scoreQuery.eq(MartialScore::getAthleteId, athleteId); scoreQuery.eq(MartialScore::getProjectId, projectId); scoreQuery.eq(MartialScore::getIsDeleted, 0); - // 排除裁判长的所有评分（包括普通评分和修改记录） + // 排除主裁判的所有评分（包括普通评分和修改记录） if (!chiefJudgeIds.isEmpty()) { scoreQuery.notIn(MartialScore::getJudgeId, chiefJudgeIds); } @@ -250,7 +250,7 @@ public class MartialMiniController extends BladeController { } /** - * 获取项目应评分的裁判数量（普通裁判，不包括裁判长） + * 获取项目应评分的裁判数量（裁判员，不包括主裁判） * 按项目过滤：检查 projects JSON 字段是否包含该项目ID */ private int getRequiredJudgeCount(Long projectId) { @@ -259,7 +259,7 @@ public class MartialMiniController extends BladeController { } LambdaQueryWrapper judgeQuery = new LambdaQueryWrapper<>(); judgeQuery.eq(MartialJudgeInvite::getIsDeleted, 0); - judgeQuery.ne(MartialJudgeInvite::getRole, "chief_judge"); // 排除裁判长 + judgeQuery.ne(MartialJudgeInvite::getRole, "chief_judge"); // 排除主裁判 // 按项目过滤：projects字段包含该项目ID judgeQuery.like(MartialJudgeInvite::getProjects, projectId.toString()); List judges = judgeInviteService.list(judgeQuery); @@ -325,8 +325,8 @@ public class MartialMiniController extends BladeController { /** * 获取选手列表（支持分页） - * - 普通裁判：获取所有选手，标记是否已评分 - * - 裁判长：获取所有普通裁判都评分完成的选手列表 + * - 裁判员：获取所有选手，标记是否已评分 + * - 主裁判：获取所有裁判员都评分完成的选手列表 */ @GetMapping("/score/athletes") @Operation(summary = "获取选手列表", description = "根据裁判类型获取选手列表（支持分页）") @@ -356,10 +356,10 @@ public class MartialMiniController extends BladeController { List athletes = athleteService.list(athleteQuery); - // 2. 获取该场地所有裁判长的judge_id列表 + // 2. 获取该场地所有主裁判的judge_id列表 List chiefJudgeIds = getChiefJudgeIds(venueId); - // 3. 获取所有评分记录（排除裁判长的评分） + // 3. 获取所有评分记录（排除主裁判的评分） LambdaQueryWrapper scoreQuery = new LambdaQueryWrapper<>(); scoreQuery.eq(MartialScore::getIsDeleted, 0); if (projectId != null) { @@ -369,7 +369,7 @@ public class MartialMiniController extends BladeController { if (venueId != null && venueId > 0) { scoreQuery.eq(MartialScore::getVenueId, venueId); } - // 排除裁判长的评分 + // 排除主裁判的评分 if (!chiefJudgeIds.isEmpty()) { scoreQuery.notIn(MartialScore::getJudgeId, chiefJudgeIds); } @@ -386,12 +386,12 @@ public class MartialMiniController extends BladeController { List filteredList; if (refereeType == 1) { - // 裁判长：返回所有选手，前端根据totalScore判断是否显示修改按钮 + // 主裁判：返回所有选手，前端根据totalScore判断是否显示修改按钮 filteredList = athletes.stream() .map(athlete -> convertToAthleteListVO(athlete, scoresByAthlete.get(athlete.getId()), judgeId, requiredJudgeCount)) .collect(java.util.stream.Collectors.toList()); } else { - // 普通裁判：返回所有选手，标记是否已评分 + // 裁判员：返回所有选手，标记是否已评分 filteredList = athletes.stream() .map(athlete -> convertToAthleteListVO(athlete, scoresByAthlete.get(athlete.getId()), judgeId, requiredJudgeCount)) .collect(java.util.stream.Collectors.toList()); @@ -417,7 +417,7 @@ public class MartialMiniController extends BladeController { } /** - * 获取场地所有裁判长的judge_id列表 + * 获取场地所有主裁判的judge_id列表 */ private List getChiefJudgeIds(Long venueId) { if (venueId == null) { @@ -445,10 +445,10 @@ public class MartialMiniController extends BladeController { } /** - * 修改评分（裁判长） + * 修改评分（主裁判） */ @PutMapping("/score/modify") - @Operation(summary = "修改评分", description = "裁判长修改选手总分") + @Operation(summary = "修改评分", description = "主裁判修改选手总分") public R modifyScore(@RequestBody MiniScoreModifyDTO dto) { boolean success = scoreService.modifyScoreByAdmin(dto); return success ? R.success("修改成功") : R.fail("修改失败"); diff --git a/src/main/java/org/springblade/modules/martial/pojo/dto/BatchGenerateInviteDTO.java b/src/main/java/org/springblade/modules/martial/pojo/dto/BatchGenerateInviteDTO.java index 3dabd61..898e3a0 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/dto/BatchGenerateInviteDTO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/dto/BatchGenerateInviteDTO.java @@ -20,7 +20,7 @@ public class BatchGenerateInviteDTO { @Schema(description = "评委ID列表", required = true) private List judgeIds; - @Schema(description = "角色：judge-普通评委，chief_judge-裁判长") + @Schema(description = "角色：judge-普通评委，chief_judge-主裁判") private String role = "judge"; @Schema(description = "过期天数（默认30天）") diff --git a/src/main/java/org/springblade/modules/martial/pojo/dto/GenerateInviteDTO.java b/src/main/java/org/springblade/modules/martial/pojo/dto/GenerateInviteDTO.java index 9c3b221..598a7ab 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/dto/GenerateInviteDTO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/dto/GenerateInviteDTO.java @@ -19,7 +19,7 @@ public class GenerateInviteDTO { @Schema(description = "评委ID", required = true) private Long judgeId; - @Schema(description = "角色：judge-普通评委，chief_judge-裁判长", required = true) + @Schema(description = "角色：judge-普通评委，chief_judge-主裁判", required = true) private String role; @Schema(description = "分配场地ID（普通评委必填）") diff --git a/src/main/java/org/springblade/modules/martial/pojo/dto/MiniScoreModifyDTO.java b/src/main/java/org/springblade/modules/martial/pojo/dto/MiniScoreModifyDTO.java index 29f4740..b2b6cda 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/dto/MiniScoreModifyDTO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/dto/MiniScoreModifyDTO.java @@ -20,7 +20,7 @@ public class MiniScoreModifyDTO implements Serializable { @Schema(description = "选手ID") private Long athleteId; - @Schema(description = "修改者ID（裁判长ID）") + @Schema(description = "修改者ID（主裁判ID）") private Long modifierId; @Schema(description = "修改后的分数") diff --git a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudge.java b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudge.java index 15dc887..d6433fb 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudge.java +++ b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudge.java @@ -60,7 +60,7 @@ public class MartialJudge extends TenantEntity { private String idCard; /** - * 裁判类型(1-裁判长,2-普通裁判) + * 裁判类型(1-主裁判,2-裁判员) */ @Schema(description = "裁判类型") private Integer refereeType; diff --git a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudgeInvite.java b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudgeInvite.java index 7626dda..0ac03ac 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudgeInvite.java +++ b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialJudgeInvite.java @@ -56,7 +56,7 @@ public class MartialJudgeInvite extends TenantEntity { private String inviteCode; /** - * 角色(judge-普通裁判,chief_judge-裁判长) + * 角色(judge-裁判员,chief_judge-主裁判) */ @Schema(description = "角色") private String role; diff --git a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteAdminVO.java b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteAdminVO.java index 6755ff3..6d0a034 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteAdminVO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniAthleteAdminVO.java @@ -7,12 +7,12 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * 小程序选手评分VO（裁判长视图） + * 小程序选手评分VO（主裁判视图） * * @author BladeX */ @Data -@Schema(description = "小程序选手评分信息（裁判长）") +@Schema(description = "小程序选手评分信息（主裁判）") public class MiniAthleteAdminVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniLoginVO.java b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniLoginVO.java index fdf62b8..827274e 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniLoginVO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniLoginVO.java @@ -20,7 +20,7 @@ public class MiniLoginVO implements Serializable { @Schema(description = "访问令牌") private String token; - @Schema(description = "用户角色：pub-普通评委, admin-裁判长") + @Schema(description = "用户角色：pub-普通评委, admin-主裁判") private String userRole; @Schema(description = "比赛ID") diff --git a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniScoreDetailVO.java b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniScoreDetailVO.java index 5338775..e9fe535 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/vo/MiniScoreDetailVO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/vo/MiniScoreDetailVO.java @@ -25,7 +25,7 @@ public class MiniScoreDetailVO implements Serializable { @Schema(description = "评委评分列表") private List judgeScores; - @Schema(description = "裁判长修改信息") + @Schema(description = "主裁判修改信息") private Modification modification; /** @@ -82,10 +82,10 @@ public class MiniScoreDetailVO implements Serializable { } /** - * 裁判长修改信息内部类 + * 主裁判修改信息内部类 */ @Data - @Schema(description = "裁判长修改信息") + @Schema(description = "主裁判修改信息") public static class Modification implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/springblade/modules/martial/service/IMartialAthleteService.java b/src/main/java/org/springblade/modules/martial/service/IMartialAthleteService.java index 2653c17..45e5c95 100644 --- a/src/main/java/org/springblade/modules/martial/service/IMartialAthleteService.java +++ b/src/main/java/org/springblade/modules/martial/service/IMartialAthleteService.java @@ -57,7 +57,7 @@ public interface IMartialAthleteService extends IService { List getAthletesWithMyScore(Long judgeId, Long venueId, Long projectId); /** - * 小程序接口：获取选手列表（裁判长） + * 小程序接口：获取选手列表（主裁判） * * @param competitionId 比赛ID * @param venueId 场地ID diff --git a/src/main/java/org/springblade/modules/martial/service/IMartialScoreService.java b/src/main/java/org/springblade/modules/martial/service/IMartialScoreService.java index 7095ebc..99aa402 100644 --- a/src/main/java/org/springblade/modules/martial/service/IMartialScoreService.java +++ b/src/main/java/org/springblade/modules/martial/service/IMartialScoreService.java @@ -44,7 +44,7 @@ public interface IMartialScoreService extends IService { MiniScoreDetailVO getScoreDetailForMini(Long athleteId); /** - * 小程序接口：修改评分（裁判长） + * 小程序接口：修改评分（主裁判） * * @param dto 修改信息 * @return 修改成功/失败 diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialAthleteServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialAthleteServiceImpl.java index e509965..8c50c4d 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialAthleteServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialAthleteServiceImpl.java @@ -273,7 +273,7 @@ public class MartialAthleteServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MartialScore::getAthleteId, dto.getAthleteId()) - .like(MartialScore::getJudgeName, "裁判长修改"); + .like(MartialScore::getJudgeName, "主裁判修改"); MartialScore existingRecord = this.getOne(queryWrapper); // 4. 确定原始计算总分（用于范围验证） @@ -369,17 +369,17 @@ public class MartialScoreServiceImpl extends ServiceImpl 0; - log.info("裁判长更新评分记录 - 选手ID:{}, 姓名:{}, 原始计算总分:{}, 修改后总分:{}, 修改原因:{}", + log.info("主裁判更新评分记录 - 选手ID:{}, 姓名:{}, 原始计算总分:{}, 修改后总分:{}, 修改原因:{}", athlete.getId(), athlete.getPlayerName(), originalCalculatedScore, dto.getModifiedScore(), dto.getNote()); } else { - // 7b. 创建新的裁判长修改记录 + // 7b. 创建新的主裁判修改记录 MartialScore modificationRecord = new MartialScore(); modificationRecord.setCompetitionId(athlete.getCompetitionId()); modificationRecord.setAthleteId(athlete.getId()); @@ -395,11 +395,11 @@ public class MartialScoreServiceImpl extends ServiceImpl