From 239c6621906b3b1966f6e111ecef379c7264bb22 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 1 Jul 2024 17:25:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BB=84=E7=9A=84=E6=89=A7=E8=A1=8C=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1015333 --user=宋昌昌 【测试计划】完成剩余功能 https://www.tapd.cn/55049933/s/1540855
---
 .../plan/dto/request/TestPlanExecuteHisPageRequest.java        | 2 +-
 .../main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanExecuteHisPageRequest.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanExecuteHisPageRequest.java
index 2af3b1407c..b61f9671d4 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanExecuteHisPageRequest.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/request/TestPlanExecuteHisPageRequest.java
@@ -9,6 +9,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class TestPlanExecuteHisPageRequest extends BasePageRequest {
 
-	@Schema(description = "测试计划ID", requiredMode = Schema.RequiredMode.REQUIRED)
+	@Schema(description = "测试计划/计划组ID", requiredMode = Schema.RequiredMode.REQUIRED)
 	private String testPlanId;
 }
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
index cfe58ef50c..c7d0cc48c1 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
@@ -462,10 +462,11 @@
 
     <select id="listHis" resultType="io.metersphere.plan.dto.TestPlanExecuteHisDTO">
         select tpr.id, from_unixtime(tpr.create_time / 1000, '%Y%m%d%H%i%s') as num, tpr.trigger_mode triggerMode, tpr.exec_status execStatus, tpr.result_status execResult,
-               tpr.create_user operationUser, tpr.start_time startTime, tpr.end_time endTime, tpr.deleted deleted from test_plan_report tpr
+               tpr.create_user operationUser, tpr.start_time startTime, tpr.end_time endTime, tpr.deleted as deleted from test_plan_report tpr
         where tpr.test_plan_id = #{request.testPlanId}
         <include refid="filter"/>
     </select>
+
     <select id="selectGroupIdByKeyword" resultType="java.lang.String">
         SELECT t.group_id
         FROM test_plan t