diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 55e0343..5f7a757 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 23e8788..25f0576 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 7e1825f..49ab5c7 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 0b42404..c515d89 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 cc7850a..bcda272 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 40d9b94..91be04a 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 cbf8d4a..033c60e 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 81ee71f..497da9e 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/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java index 0f67a7e..6755fe1 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -766,4 +766,14 @@ public class MartialMiniController extends BladeController { return R.data(venues); } + /** + * 获取已总裁确认的成绩列表 + */ + @GetMapping("/general/confirmed") + @Operation(summary = "已总裁确认列表", description = "获取已总裁确认的成绩列表") + public R> getConfirmedGeneralList(@RequestParam Long competitionId) { + List list = resultService.getConfirmedGeneralList(competitionId); + return R.data(list); + } + } diff --git a/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java b/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java index 939d3d8..75034d4 100644 --- a/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java +++ b/src/main/java/org/springblade/modules/martial/service/IMartialResultService.java @@ -93,4 +93,10 @@ public interface IMartialResultService extends IService { */ List getPendingGeneralConfirmList(Long competitionId); + + /** + * 获取已总裁确认的成绩列表 + */ + List getConfirmedGeneralList(Long competitionId); + } diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java index 15c16f3..978ba03 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialResultServiceImpl.java @@ -713,4 +713,31 @@ public class MartialResultServiceImpl extends ServiceImpl getConfirmedGeneralList(Long competitionId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("competition_id", competitionId); + wrapper.eq("is_deleted", 0); + wrapper.eq("score_status", MartialResult.SCORE_STATUS_GENERAL_CONFIRMED); + wrapper.orderByDesc("general_judge_time"); + List results = this.list(wrapper); + + // 填充选手信息 + for (MartialResult result : results) { + if (result.getAthleteId() != null) { + MartialAthlete athlete = athleteService.getById(result.getAthleteId()); + if (athlete != null) { + result.setPlayerName(athlete.getPlayerName()); + result.setTeamName(athlete.getTeamName()); + } + } + } + + return results; + } + } +