From bc235b8fbee309a8e43ae8226439dea0ea3262e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=85=E6=88=BF?= Date: Fri, 9 Jan 2026 17:58:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BC=96=E6=8E=92?= =?UTF-8?q?=E9=A2=84=E8=AE=A1=E6=97=B6=E9=95=BF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. CompetitionGroupDTO添加estimatedDuration字段 2. ScheduleGroupDetailVO添加estimatedDuration字段 3. SQL查询添加estimated_duration 4. 前端场地视图显示合计时间 Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com> --- .../modules/martial/mapper/MartialScheduleGroupMapper.xml | 1 + .../modules/martial/pojo/dto/CompetitionGroupDTO.java | 6 ++++++ .../modules/martial/pojo/vo/ScheduleGroupDetailVO.java | 1 + .../service/impl/MartialScheduleArrangeServiceImpl.java | 1 + .../martial/service/impl/MartialScheduleServiceImpl.java | 1 + 5 files changed, 10 insertions(+) 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()