From 9801f93f02d3b9e28392ee7098d6ffc332883be6 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Mon, 12 Aug 2024 17:52:19 +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=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=A0=BC=E5=BC=8F=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1044969 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001044969 --- .../plan/dto/response/TestPlanCaseExecHistoryResponse.java | 2 +- .../plan/mapper/ExtTestPlanCaseExecuteHistoryMapper.xml | 4 +++- .../plan/service/TestPlanFunctionalCaseService.java | 1 - frontend/src/models/testPlan/testPlan.ts | 2 +- .../detail/featureCase/detail/executionHistory/index.vue | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java index b74e4abb18..cf24e9d297 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/response/TestPlanCaseExecHistoryResponse.java @@ -26,5 +26,5 @@ public class TestPlanCaseExecHistoryResponse extends TestPlanCaseExecuteHistory private String email; @Schema(description = "步骤描述") - private boolean stepModule = false; + private String caseEditType; } diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanCaseExecuteHistoryMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanCaseExecuteHistoryMapper.xml index 74bd11c9fe..8253b25d35 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanCaseExecuteHistoryMapper.xml +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanCaseExecuteHistoryMapper.xml @@ -25,11 +25,13 @@ tpceh.notifier as notifier, u.name AS userName, ux.avatar AS userLogo, - u.email AS email + u.email AS email, + fc.case_edit_type as caseEditType FROM test_plan_case_execute_history tpceh left JOIN user u ON tpceh.create_user = u.id left JOIN user_extend ux ON tpceh.create_user = ux.id + LEFT JOIN functional_case fc ON tpceh.case_id = fc.id WHERE tpceh.test_plan_case_id = #{request.id} AND tpceh.deleted = FALSE diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java index 12f06725a2..81ce45bf78 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java @@ -705,7 +705,6 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService { item.setContentText(new String(item.getContent(), StandardCharsets.UTF_8)); } if (item.getSteps() != null) { - item.setStepModule(true); item.setStepsExecResult(new String(item.getSteps(), StandardCharsets.UTF_8)); } }); diff --git a/frontend/src/models/testPlan/testPlan.ts b/frontend/src/models/testPlan/testPlan.ts index 9aafd8fde4..db5465864c 100644 --- a/frontend/src/models/testPlan/testPlan.ts +++ b/frontend/src/models/testPlan/testPlan.ts @@ -268,7 +268,7 @@ export interface ExecuteHistoryItem { steps: string; createTime: string; deleted: boolean; - stepModule: boolean; // 类型是：步骤描述 + caseEditType: string; // 类型是：步骤描述 } export interface moduleForm { diff --git a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue index 4ffa56daa9..69a00d12dd 100644 --- a/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue +++ b/frontend/src/views/test-plan/testPlan/detail/featureCase/detail/executionHistory/index.vue @@ -9,12 +9,12 @@
{{ item.userName }}