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 @@