From f1f9f5f2ddb3b561eac4f9eb8f875b1a1dc476f1 Mon Sep 17 00:00:00 2001 From: "nathan.liu" Date: Wed, 24 Aug 2022 18:53:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AE=8C=E6=88=90=E6=89=A7=E8=A1=8C=E5=90=8E=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1015942 --user=刘瑶 【测试跟踪】github#16977，在测试计划列表列表中点击【执行】，完成执行后。该计划当前状态不对：测试进度非100%，但是当前状态为“完成”。 https://www.tapd.cn/55049933/s/1232711 Closes#16977 --- .../main/java/io/metersphere/track/service/TestPlanService.java | 1 + backend/src/main/java/io/metersphere/xpack | 2 +- frontend/src/business/components/xpack | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java index e3acb02d65..b9e1797b6d 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -499,6 +499,7 @@ public class TestPlanService { statusList.addAll(testPlanApiCaseService.getExecResultByPlanId(testPlanId)); statusList.addAll(testPlanScenarioCaseService.getExecResultByPlanId(testPlanId)); statusList.addAll(testPlanLoadCaseService.getStatus(testPlanId)); + statusList.addAll(testPlanUiScenarioCaseService.getExecResultByPlanId(testPlanId)); TestPlanWithBLOBs testPlanWithBLOBs = testPlanMapper.selectByPrimaryKey(testPlanId); //如果测试计划是已归档状态，不处理 if (testPlanWithBLOBs.getStatus().equals(TestPlanStatus.Archived.name())) { diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 7cdda1b8f4..73584558c6 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 7cdda1b8f4554cb4185997d6a6beb2bc72809eed +Subproject commit 73584558c69e47496daa0e40b19f162c479693f8 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index dc732de117..57f594ed64 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit dc732de11799623169ffa05a230fc33540704a65 +Subproject commit 57f594ed643407d3a5513515dceda4c7ca2c1352