From bab9cc98a12675fd956b98283eac3b0ce04d728f Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 5 Nov 2021 21:33:09 +0800
Subject: [PATCH] =?UTF-8?q?feat=5F=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=96=B0=E5=A2=9E=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanReportMapper.xml    | 93 ++++++++++++++++++-
 .../report/QueryTestPlanReportRequest.java    |  4 +-
 .../api/definition/ApiDefinition.vue          |  1 -
 .../components/search/search-components.js    |  1 +
 .../track/report/TestPlanReport.vue           |  3 +-
 .../report/components/TestPlanReportList.vue  |  2 +-
 6 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml
index 9485d68ae8..6bc791134b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml
@@ -2,15 +2,106 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.metersphere.base.mapper.ext.ExtTestPlanReportMapper">
 
+    <sql id="condition">
+        <choose>
+            <when test='${object}.operator == "like"'>
+                like CONCAT('%', #{${object}.value},'%')
+            </when>
+            <when test='${object}.operator == "not like"'>
+                not like CONCAT('%', #{${object}.value},'%')
+            </when>
+            <when test='${object}.operator == "in"'>
+                in
+                <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
+                    #{v}
+                </foreach>
+            </when>
+            <when test='${object}.operator == "not in"'>
+                not in
+                <foreach collection="${object}.value" item="v" separator="," open="(" close=")">
+                    #{v}
+                </foreach>
+            </when>
+            <when test='${object}.operator == "between"'>
+                between #{${object}.value[0]} and #{${object}.value[1]}
+            </when>
+            <when test='${object}.operator == "gt"'>
+                &gt; #{${object}.value}
+            </when>
+            <when test='${object}.operator == "lt"'>
+                &lt; #{${object}.value}
+            </when>
+            <when test='${object}.operator == "ge"'>
+                &gt;= #{${object}.value}
+            </when>
+            <when test='${object}.operator == "le"'>
+                &lt;= #{${object}.value}
+            </when>
+            <when test='${object}.operator == "current user"'>
+                = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}'
+            </when>
+            <otherwise>
+                = #{${object}.value}
+            </otherwise>
+        </choose>
+    </sql>
+
+    <sql id="combine">
+        <if test='${condition}.name != null and (${name} == null or ${name} == "")'>
+            and tpr.name
+            <include refid="condition">
+                <property name="object" value="${condition}.name"/>
+            </include>
+        </if>
+        <if test="${condition}.creator != null">
+            and tpr.creator
+            <include refid="condition">
+                <property name="object" value="${condition}.creator"/>
+            </include>
+
+        </if>
+        <if test="${condition}.testPlanName != null">
+            and tp.name
+            <include refid="condition">
+                <property name="object" value="${condition}.testPlanName"/>
+            </include>
+
+        </if>
+        <if test="${condition}.createTime != null">
+            and tpr.create_time
+            <include refid="condition">
+                <property name="object" value="${condition}.createTime"/>
+            </include>
+        </if>
+        <if test="${condition}.status != null">
+            and tpr.status
+            <include refid="condition">
+                <property name="object" value="${condition}.status"/>
+            </include>
+        </if>
+        <if test="${condition}.triggerMode != null">
+            and tpr.trigger_mode
+            <include refid="condition">
+                <property name="object" value="${condition}.triggerMode"/>
+            </include>
+        </if>
+    </sql>
+
     <select id="list" resultType="io.metersphere.track.dto.TestPlanReportDTO"
             parameterType="io.metersphere.track.request.report.QueryTestPlanReportRequest">
         SELECT tpr.id AS id, tpr.`name` AS `name`, tp.`name` AS testPlanName,
         IF(u.name is null,tpr.creator,u.name)AS creator, tpr.is_new, tpr.test_plan_id,
-        tpr.create_time AS createTime,tpr.trigger_Mode AS triggerMode,tpr.status AS status
+        tpr.create_time AS createTime,tpr.trigger_mode AS triggerMode,tpr.status AS status
         FROM test_plan tp
         INNER JOIN test_plan_report tpr on tp.id = tpr.test_plan_id
         LEFT JOIN user u on tpr.creator = u.id
         <where>
+            <if test="combine != null">
+                <include refid="combine">
+                    <property name="condition" value="combine"/>
+                    <property name="name" value="name"/>
+                </include>
+            </if>
             <if test="name != null">
                 and tpr.name like CONCAT('%', #{name},'%')
             </if>
diff --git a/backend/src/main/java/io/metersphere/track/request/report/QueryTestPlanReportRequest.java b/backend/src/main/java/io/metersphere/track/request/report/QueryTestPlanReportRequest.java
index 384c21e19c..4d956bcdbb 100644
--- a/backend/src/main/java/io/metersphere/track/request/report/QueryTestPlanReportRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/report/QueryTestPlanReportRequest.java
@@ -15,7 +15,7 @@ import java.util.Map;
  */
 @Getter
 @Setter
-@Data
+
 public class QueryTestPlanReportRequest {
     private String name;
     private String testPlanName;
@@ -23,6 +23,8 @@ public class QueryTestPlanReportRequest {
     private String workspaceId;
     private String projectId;
 
+    private Map<String, Object> combine;
+
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
 
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index e79c819510..224986853f 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -575,7 +575,6 @@ export default {
           });
         }
       } else{
-        this.$store.state.apiMap.delete(tabs[1].api.id);
         this.handleTabRemove(targetName);
       }
 
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index 2a3bda9d53..5c2bb75943 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -457,6 +457,7 @@ export const TEST_PLAN_TRIGGER_MODE = {
   options: [
     {label: 'test_track.report.trigger_mode.manual', value: 'manual'},
     {label: 'test_track.report.trigger_mode.automation', value: 'automation'},
+    {label: "commons.trigger_mode.schedule", value: "SCHEDULE"},
   ],
   props: {
     multiple: true
diff --git a/frontend/src/business/components/track/report/TestPlanReport.vue b/frontend/src/business/components/track/report/TestPlanReport.vue
index 4bc9d02ba2..7122d7ce36 100644
--- a/frontend/src/business/components/track/report/TestPlanReport.vue
+++ b/frontend/src/business/components/track/report/TestPlanReport.vue
@@ -13,6 +13,7 @@
 import TestPlanReportList from './components/TestPlanReportList';
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
+import {TEST_PLAN_REPORT_CONFIGS} from "@/business/components/common/components/search/search-components";
 
 export default {
   name: "TestPlanReport",
@@ -32,7 +33,7 @@ export default {
   },
   methods: {
     refreshTestPlanList() {
-      this.$refs.testPlanReportList.condition = {};
+      this.$refs.testPlanReportList.condition = {components: TEST_PLAN_REPORT_CONFIGS};
       this.$refs.testPlanReportList.initTableData();
     }
   }
diff --git a/frontend/src/business/components/track/report/components/TestPlanReportList.vue b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
index a72883801f..96a14cafe2 100644
--- a/frontend/src/business/components/track/report/components/TestPlanReportList.vue
+++ b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
@@ -142,7 +142,7 @@ export default {
     }
   },
   activated() {
-    this.components = TEST_PLAN_REPORT_CONFIGS;
+
   },
   created() {
     this.projectId = this.$route.params.projectId;