diff --git a/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/minio_data/.minio.sys/buckets/.bloomcycle.bin/xl.meta index 19d1888..1146bf7 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 385bdeb..0fd6f34 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 8412374..d0ef0c3 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 795d7e2..4287c32 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 74784f8..da1016b 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 5fc2cfc..4c1f1e3 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/.metadata.bin/xl.meta b/minio_data/.minio.sys/buckets/assets/.metadata.bin/xl.meta index 69ee1f3..1e68eb7 100644 Binary files a/minio_data/.minio.sys/buckets/assets/.metadata.bin/xl.meta and b/minio_data/.minio.sys/buckets/assets/.metadata.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 ca74cb4..f9eadf5 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 7050b6f..56ca133 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 7bd2342..4e6f5cd 100644 --- a/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java +++ b/src/main/java/org/springblade/modules/martial/controller/MartialMiniController.java @@ -114,13 +114,18 @@ public class MartialMiniController extends BladeController { martialVenue = venueService.getById(invite.getVenueId()); } - // 获取项目列表:如果邀请记录中有指定项目则使用,否则获取该比赛的所有项目 + // 获取项目列表:如果邀请记录中有指定项目则使用,否则根据场地获取项目 List projects; if (Func.isNotEmpty(invite.getProjects())) { projects = parseProjects(invite.getProjects()); } else { - // 未指定项目,获取该比赛的所有项目(裁判负责整个场地) - projects = getAllProjectsByCompetition(competition.getId()); + // 未指定项目,根据场地获取项目;如果没有场地则获取所有项目 + if (invite.getVenueId() != null) { + projects = getProjectsByVenue(invite.getVenueId()); + } else { + // 总裁或未分配场地的裁判,获取所有项目 + projects = getAllProjectsByCompetition(competition.getId()); + } } MiniLoginVO vo = new MiniLoginVO(); @@ -517,13 +522,18 @@ public class MartialMiniController extends BladeController { MartialCompetition competition = competitionService.getById(invite.getCompetitionId()); MartialJudge judge = judgeService.getById(invite.getJudgeId()); MartialVenue martialVenue = invite.getVenueId() != null ? venueService.getById(invite.getVenueId()) : null; - // 获取项目列表:如果邀请记录中有指定项目则使用,否则获取该比赛的所有项目 + // 获取项目列表:如果邀请记录中有指定项目则使用,否则根据场地获取项目 List projects; if (Func.isNotEmpty(invite.getProjects())) { projects = parseProjects(invite.getProjects()); } else { - // 未指定项目,获取该比赛的所有项目(裁判负责整个场地) - projects = getAllProjectsByCompetition(competition.getId()); + // 未指定项目,根据场地获取项目;如果没有场地则获取所有项目 + if (invite.getVenueId() != null) { + projects = getProjectsByVenue(invite.getVenueId()); + } else { + // 总裁或未分配场地的裁判,获取所有项目 + projects = getAllProjectsByCompetition(competition.getId()); + } } MiniLoginVO vo = new MiniLoginVO(); @@ -698,6 +708,30 @@ public class MartialMiniController extends BladeController { return projects; } + /** + * 根据场地获取项目列表 + */ + private List getProjectsByVenue(Long venueId) { + List projects = new ArrayList<>(); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MartialProject::getVenueId, venueId); + wrapper.eq(MartialProject::getIsDeleted, 0); + + List projectList = projectService.list(wrapper); + + if (Func.isNotEmpty(projectList)) { + projects = projectList.stream().map(project -> { + MiniLoginVO.ProjectInfo info = new MiniLoginVO.ProjectInfo(); + info.setProjectId(project.getId()); + info.setProjectName(project.getProjectName()); + return info; + }).collect(Collectors.toList()); + } + + return projects; + } + // ========== 三级裁判评分流程 API ========== diff --git a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java index bc5d236..1e3fd3a 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java +++ b/src/main/java/org/springblade/modules/martial/pojo/entity/MartialProject.java @@ -45,6 +45,12 @@ public class MartialProject extends TenantEntity { @Schema(description = "赛事ID") private Long competitionId; + /** + * 所属场地ID + */ + @Schema(description = "所属场地ID") + private Long venueId; + /** * 项目名称 */