From 51c84875c9cde610c461fdefce9f6515cacb187f Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Tue, 5 Nov 2024 11:33:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E5=9C=BA=E6=99=AF/?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E5=91=8A=E6=96=B0=E5=A2=9E=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/mapper/ExtApiReportMapper.java        |  3 +
 .../api/mapper/ExtApiReportMapper.xml         | 55 ++++++++++++++++++
 .../mapper/ExtApiScenarioReportMapper.java    |  3 +
 .../api/mapper/ExtApiScenarioReportMapper.xml | 57 +++++++++++++++++++
 .../system/constants/UserViewType.java        |  6 ++
 .../plan/mapper/ExtTestPlanReportMapper.xml   | 12 ++--
 6 files changed, 130 insertions(+), 6 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.java
index a3fc1ae57a..a3a552ce2b 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.java
@@ -10,13 +10,16 @@ import io.metersphere.system.dto.sdk.ApiReportMessageDTO;
 import io.metersphere.system.dto.taskcenter.TaskCenterDTO;
 import io.metersphere.system.dto.taskcenter.request.TaskCenterBatchRequest;
 import io.metersphere.system.dto.taskcenter.request.TaskCenterPageRequest;
+import io.metersphere.system.interceptor.BaseConditionFilter;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface ExtApiReportMapper {
+    @BaseConditionFilter
     List<ApiReport> list(@Param("request") ApiReportPageRequest request);
 
+    @BaseConditionFilter
     List<String> getIds(@Param("request") ApiReportBatchRequest request);
 
     List<ApiReport> selectApiReportByIds(@Param("ids") List<String> ids);
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
index 1779c65dab..567f36e647 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
@@ -41,6 +41,9 @@
         <include refid="filters">
             <property name="filter" value="request.filter"/>
         </include>
+        <include refid="combine">
+            <property name="combineSearch" value="request.combineSearch"/>
+        </include>
     </select>
     <select id="getIds" resultType="java.lang.String">
         select
@@ -58,6 +61,9 @@
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
         </include>
+        <include refid="combine">
+            <property name="combineSearch" value="request.condition.combineSearch"/>
+        </include>
     </select>
     <select id="selectApiReportByIds" resultType="io.metersphere.api.domain.ApiReport">
         select
@@ -283,4 +289,53 @@
         </if>
     </select>
 
+    <sql id="combine">
+        <trim prefix="AND">
+            <trim prefix="(" suffix=")" suffixOverrides="AND|OR">
+                <if test="${combineSearch} != null">
+                    <foreach collection="${combineSearch}.userViewConditions" item="condition">
+                        <if test="condition.name == 'createUser'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="ar.create_user"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                    <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
+                        <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
+                            <property name="condition" value="condition"/>
+                            <property name="tablePrefix" value="ar"/>
+                        </include>
+                        <!-- 报告类型 -->
+                        <if test="condition.name == 'integrated'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="ar.integrated"/>
+                            </include>
+                        </if>
+                        <!-- 执行结果 -->
+                        <if test="condition.name == 'status'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="ar.status"/>
+                            </include>
+                        </if>
+                        <!-- 触发方式 -->
+                        <if test="condition.name == 'triggerMode'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="ar.trigger_mode"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                </if>
+            </trim>
+        </trim>
+    </sql>
 </mapper>
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
index 953c8b98a0..92d3a3b889 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.java
@@ -11,13 +11,16 @@ import io.metersphere.system.dto.sdk.ApiReportMessageDTO;
 import io.metersphere.system.dto.taskcenter.TaskCenterDTO;
 import io.metersphere.system.dto.taskcenter.request.TaskCenterBatchRequest;
 import io.metersphere.system.dto.taskcenter.request.TaskCenterPageRequest;
+import io.metersphere.system.interceptor.BaseConditionFilter;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface ExtApiScenarioReportMapper {
+    @BaseConditionFilter
     List<ApiScenarioReport> list(@Param("request") ApiReportPageRequest request);
 
+    @BaseConditionFilter
     List<String> getIds(@Param("request") ApiReportBatchRequest request);
 
     List<ApiScenarioReport> selectApiReportByIds(@Param("ids") List<String> ids);
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
index f79fdecbca..2e33cc97f5 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
@@ -40,6 +40,9 @@
         <include refid="filters">
             <property name="filter" value="request.filter"/>
         </include>
+        <include refid="combine">
+            <property name="combineSearch" value="request.combineSearch"/>
+        </include>
     </select>
     <select id="getIds" resultType="java.lang.String">
         select
@@ -57,6 +60,9 @@
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
         </include>
+        <include refid="combine">
+            <property name="combineSearch" value="request.condition.combineSearch"/>
+        </include>
     </select>
     <select id="selectApiReportByIds" resultType="io.metersphere.api.domain.ApiScenarioReport">
         select
@@ -321,4 +327,55 @@
         </if>
     </sql>
 
+
+    <sql id="combine">
+        <trim prefix="AND">
+            <trim prefix="(" suffix=")" suffixOverrides="AND|OR">
+                <if test="${combineSearch} != null">
+                    <foreach collection="${combineSearch}.userViewConditions" item="condition">
+                        <if test="condition.name == 'createUser'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="asr.create_user"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                    <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
+                        <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
+                            <property name="condition" value="condition"/>
+                            <property name="tablePrefix" value="asr"/>
+                        </include>
+                        <!-- 报告类型 -->
+                        <if test="condition.name == 'integrated'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="asr.integrated"/>
+                            </include>
+                        </if>
+                        <!-- 执行结果 -->
+                        <if test="condition.name == 'status'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="asr.status"/>
+                            </include>
+                        </if>
+                        <!-- 触发方式 -->
+                        <if test="condition.name == 'triggerMode'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="asr.trigger_mode"/>
+                            </include>
+                        </if>
+                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
+                            <property name="searchMode" value="${combineSearch}.searchMode"/>
+                        </include>
+                    </foreach>
+                </if>
+            </trim>
+        </trim>
+    </sql>
+
 </mapper>
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java b/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java
index 06efa5a98c..e25b4588cf 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/constants/UserViewType.java
@@ -69,6 +69,12 @@ public enum UserViewType implements ValueEnum {
      * 测试计划报告
      */
     TEST_PLAN_REPORT("test-plan-report",
+            List.of(InternalUserView.ALL_DATA, InternalUserView.MY_CREATE)),
+
+    /**
+     * 接口报告
+     */
+    API_REPORT("api-report",
             List.of(InternalUserView.ALL_DATA, InternalUserView.MY_CREATE));
 
     private String value;
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml
index bfbf87f907..a5ff02a7f7 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportMapper.xml
@@ -469,7 +469,7 @@
                         <if test="condition.name == 'createUser'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
-                                <property name="column" value="t.create_user"/>
+                                <property name="column" value="tpr.create_user"/>
                             </include>
                         </if>
                         <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
@@ -485,35 +485,35 @@
                         <if test="condition.name == 'integrated'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
-                                <property name="column" value="trp.integrated"/>
+                                <property name="column" value="tpr.integrated"/>
                             </include>
                         </if>
                         <!-- 测试计划名称 -->
                         <if test="condition.name == 'testPlanName'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
-                                <property name="column" value="trp.test_plan_name"/>
+                                <property name="column" value="tpr.test_plan_name"/>
                             </include>
                         </if>
                         <!-- 执行结果 -->
                         <if test="condition.name == 'resultStatus'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
-                                <property name="column" value="trp.result_status"/>
+                                <property name="column" value="tpr.result_status"/>
                             </include>
                         </if>
                         <!-- 通过率 -->
                         <if test="condition.name == 'passRate'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
-                                <property name="column" value="trp.pass_rate"/>
+                                <property name="column" value="tpr.pass_rate"/>
                             </include>
                         </if>
                         <!-- 触发方式 -->
                         <if test="condition.name == 'triggerMode'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
-                                <property name="column" value="trp.trigger_mode"/>
+                                <property name="column" value="tpr.trigger_mode"/>
                             </include>
                         </if>
                         <include refid="io.metersphere.system.mapper.BaseMapper.queryType">