diff --git a/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml b/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml index 4f6adcd..8bb0b99 100644 --- a/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml +++ b/src/main/java/org/springblade/modules/martial/mapper/MartialScheduleGroupMapper.xml @@ -12,6 +12,7 @@ g.total_teams AS totalTeams, g.total_participants AS totalParticipants, g.display_order AS displayOrder, + g.estimated_duration AS estimatedDuration, d.id AS detailId, d.venue_id AS venueId, d.venue_name AS venueName, diff --git a/src/main/java/org/springblade/modules/martial/pojo/dto/CompetitionGroupDTO.java b/src/main/java/org/springblade/modules/martial/pojo/dto/CompetitionGroupDTO.java index 3ab4b67..a13a01a 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/dto/CompetitionGroupDTO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/dto/CompetitionGroupDTO.java @@ -77,6 +77,12 @@ public class CompetitionGroupDTO implements Serializable { @Schema(description = "时间段索引") private Integer timeSlotIndex; + /** + * 预计时长(分钟) + */ + @Schema(description = "预计时长(分钟)") + private Integer estimatedDuration; + /** * 参赛人员列表 */ diff --git a/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java b/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java index 10ec88c..ff8e8c5 100644 --- a/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java +++ b/src/main/java/org/springblade/modules/martial/pojo/vo/ScheduleGroupDetailVO.java @@ -21,6 +21,7 @@ public class ScheduleGroupDetailVO implements Serializable { private Integer totalTeams; private Integer totalParticipants; private Integer displayOrder; + private Integer estimatedDuration; // 预计时长(分钟) // === 编排明细信息 === private Long detailId; diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java index a2daa3c..8e1eb11 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleArrangeServiceImpl.java @@ -176,6 +176,7 @@ public class MartialScheduleArrangeServiceImpl implements IMartialScheduleArrang groupData.put("displayOrder", group.getDisplayOrder()); groupData.put("totalParticipants", group.getTotalParticipants()); groupData.put("totalTeams", group.getTotalTeams()); + groupData.put("estimatedDuration", group.getEstimatedDuration()); // 获取该分组的场地时间段详情 LambdaQueryWrapper detailWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java index 6c6351e..a4f5306 100644 --- a/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java +++ b/src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java @@ -245,6 +245,7 @@ public class MartialScheduleServiceImpl extends ServiceImpl participantDTOs = groupDetails.stream()