From 7499e0d5192b34c61c1b9a95d55669d457e8025b Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Thu, 24 Oct 2024 14:58:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83):?= =?UTF-8?q?=20=E5=90=8E=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=B5=84=E6=BA=90num=E7=94=A8=E4=BA=8E=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dto/taskhub/TaskHubScheduleDTO.java | 3 +++ .../system/mapper/ExtScheduleMapper.xml | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/TaskHubScheduleDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/TaskHubScheduleDTO.java index aebf249994..7f06be21ec 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/TaskHubScheduleDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskhub/TaskHubScheduleDTO.java @@ -63,4 +63,7 @@ public class TaskHubScheduleDTO implements Serializable { @Schema(description = "操作时间") private Long createTime; + @Schema(description = "资源num") + private String resourceNum; + } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml index 124a96bf1f..d4cb6f1650 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml @@ -266,7 +266,8 @@ schedule.create_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, - project.name as projectName + project.name as projectName, + ads.num as resourceNum FROM schedule inner join api_definition_swagger ads on schedule.resource_id = ads.id @@ -287,7 +288,8 @@ schedule.create_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, - project.name as projectName + project.name as projectName, + api_scenario.num as resourceNum FROM schedule inner join api_scenario on schedule.resource_id = api_scenario.id @@ -308,7 +310,8 @@ schedule.create_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, - project.name as projectName + project.name as projectName, + test_plan.num as resourceNum FROM schedule inner join test_plan on schedule.resource_id = test_plan.id @@ -329,7 +332,8 @@ schedule.create_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS next_time, project.organization_id, - project.name as projectName + project.name as projectName, + project.num as resourceNum FROM schedule left join project on schedule.project_id = project.id @@ -351,7 +355,8 @@ schedule.create_time, QRTZ_TRIGGERS.NEXT_FIRE_TIME AS nextTime, project.organization_id, - project.name as projectName + project.name as projectName, + project.num as resourceNum FROM schedule left join project on schedule.project_id = project.id