feat(测试跟踪): 报告增加高级搜索

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>

backend/src/main/java/io/metersphere/track/request/report/QueryTestPlanReportRequest.java

@@ -26,6 +26,7 @@ public class QueryTestPlanReportRequest {
     private List<OrderRequest> orders;
     private Map<String, List<String>> filters;
 
+    private Map<String, Object> combine;
     /**
      * 批量操作的参数，用于判断是前台表格的当前页数据还是全库数据
      */

backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java

@@ -105,6 +105,26 @@ public class TestPlanReportService {
         if (StringUtils.isBlank(request.getProjectId())) {
             return list;
         }
+        if (request.getCombine() != null && !request.getCombine().isEmpty()) {
+            if (request.getCombine().get("status") != null) {
+                HashMap<String, Object> map = (HashMap<String, Object>) request.getCombine().get("status");
+                List<String> valueList = (List<String>) map.get("value");
+                List<String> newVal = new ArrayList<>();
+                valueList.forEach(item -> {
+                    if ("Completed".equals(item)) {
+                        newVal.add("success");
+                        newVal.add("failed");
+                        newVal.add("completed");
+                    } else if ("Underway".equals(item)) {
+                        newVal.add("Running");
+                    } else {
+                        newVal.add("Starting");
+                    }
+                });
+                valueList.clear();
+                valueList.addAll(newVal);
+            }
+        }
         list = extTestPlanReportMapper.list(request);
         return list;
     }

frontend/src/business/components/common/components/search/search-components.js

@@ -456,7 +456,26 @@ 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'},
+    {label: 'commons.trigger_mode.api', value: 'API'},
+    {label: 'api_test.automation.batch_execute', value: 'BATCH'}
+  ],
+  props: {
+    multiple: true
+  }
+};
+
+export const TEST_PLAN_REPORT_STATUS = {
+  key: "status",
+  name: 'MsTableSearchSelect',
+  label: "test_track.plan.plan_status",
+  operator: {
+    options: [OPERATORS.IN, OPERATORS.NOT_IN]
+  },
+  options: [
+    {label: 'Starting', value: 'Starting'},
+    {label: 'Running', value: 'Underway'},
+    {label: 'Completed', value: 'Completed'}
   ],
   props: {
     multiple: true
@@ -496,7 +515,7 @@ export const API_CASE_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS, API_CASE_RES
 
 export const API_SCENARIO_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR];
 
-export const TEST_PLAN_REPORT_CONFIGS = [NAME, TEST_PLAN_NAME,CREATOR, CREATE_TIME, TEST_PLAN_TRIGGER_MODE, TEST_PLAN_STATUS];
+export const TEST_PLAN_REPORT_CONFIGS = [NAME, TEST_PLAN_NAME, CREATOR, CREATE_TIME, TEST_PLAN_TRIGGER_MODE, TEST_PLAN_REPORT_STATUS];
 
 // 测试计划 功能用例
 export const TEST_PLAN_TEST_CASE_CONFIGS = [NAME, API_TAGS, MODULE, PRIORITY, CREATE_TIME, UPDATE_TIME, EXECUTOR, CASE_REVIEW_STATUS];

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();
     }
   }