From 350013a50bbe6a679ef9388707521315baf26b62 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Wed, 15 Jan 2025 11:05:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83):=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E8=AE=A1=E5=88=92=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1051467 --user=宋昌昌 【任务中心】计划详情-接口用例列表-批量执行-查看即时任务详情-执行结果为空 https://www.tapd.cn/55049933/s/1646945 --- .../system/dto/request/BatchExecTaskPageRequest.java | 3 ++- .../java/io/metersphere/system/service/BaseTaskHubService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/BatchExecTaskPageRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/BatchExecTaskPageRequest.java index ee08996b8a..dc80a8442e 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/BatchExecTaskPageRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/request/BatchExecTaskPageRequest.java @@ -12,6 +12,7 @@ public class BatchExecTaskPageRequest extends BasePageRequest { @Schema(description = "任务ID", requiredMode = Schema.RequiredMode.REQUIRED) private String taskId; - @Schema(description = "批量任务类型", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = {"API_CASE_BATCH", "API_SCENARIO_BATCH"}) + @Schema(description = "批量任务类型", requiredMode = Schema.RequiredMode.REQUIRED, + allowableValues = {"API_CASE_BATCH", "API_SCENARIO_BATCH", "TEST_PLAN_API_CASE_BATCH", "TEST_PLAN_API_SCENARIO_BATCH"}) private String batchType; } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java index 061cac7129..24a144a270 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java @@ -983,7 +983,7 @@ public class BaseTaskHubService { */ public List listBatchTaskReport(BatchExecTaskPageRequest request) { List batchReportList; - if (StringUtils.equals(ExecTaskType.API_CASE_BATCH.name(), request.getBatchType())) { + if (StringUtils.equalsAny(request.getBatchType(), ExecTaskType.API_CASE_BATCH.name(), ExecTaskType.TEST_PLAN_API_CASE_BATCH.name())) { batchReportList = extExecTaskItemMapper.list(request, "api_report"); } else { batchReportList = extExecTaskItemMapper.list(request, "api_scenario_report");