From 36504c28cc1e13f80351f312ca62586dc594bbd1 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Sat, 15 Jun 2024 14:56:48 +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=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/plan/dto/TestPlanExecuteHisDTO.java  |  2 ++
 .../io/metersphere/plan/mapper/ExtTestPlanMapper.xml | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanExecuteHisDTO.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanExecuteHisDTO.java
index 55f395498c..d743000414 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanExecuteHisDTO.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanExecuteHisDTO.java
@@ -12,6 +12,8 @@ public class TestPlanExecuteHisDTO {
 	private String num;
 	@Schema(description = "执行方式")
 	private String triggerMode;
+	@Schema(description = "执行状态")
+	private String execStatus;
 	@Schema(description = "执行结果")
 	private String execResult;
 	@Schema(description = "操作人")
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 42b84a3440..590bf27e12 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
@@ -465,7 +465,7 @@
     </select>
 
     <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,
+        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
         where tpr.test_plan_id = #{request.testPlanId}
         <include refid="filter"/>
@@ -513,9 +513,13 @@
             <foreach collection="request.filter.entrySet()" index="key" item="values">
                 <if test="values != null and values.size() > 0">
                     <choose>
-                        <!-- 执行状态 -->
-                        <when test="key == 'execStatus'">
-                            and tpr.exec_status in
+                        <when test="key == 'triggerMode'">
+                            and tpr.trigger_mode in
+                            <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
+                        </when>
+                        <!-- 执行结果 -->
+                        <when test="key == 'execResult'">
+                            and tpr.result_status in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                     </choose>