From 8fd70d84793cbc7453215d73a5e0b237bef242d7 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 19 Jun 2024 16:22:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=85=B3=E8=81=94=E7=9A=84=E7=A9=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=94=A8=E4=BE=8B=E7=BB=9F=E8=AE=A1=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1042584 --user=宋昌昌 【测试计划】计划组中的子计划关联了重复的接口用例，执行报告中去重执行了 https://www.tapd.cn/55049933/s/1531827
---
 .../mapper/ExtTestPlanReportApiCaseMapper.xml     | 13 +++++++------
 .../mapper/ExtTestPlanReportApiScenarioMapper.xml | 13 +++++++------
 .../ExtTestPlanReportFunctionalCaseMapper.xml     | 15 ++++++++-------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml
index c67e9d8045..702400f8a3 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiCaseMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.plan.mapper.ExtTestPlanReportApiCaseMapper">
     <select id="countExecuteResult" resultType="io.metersphere.plan.dto.CaseStatusCountMap">
-        select tprac.api_case_execute_result as status, count(id) as count from test_plan_report_api_case tprac
+        select ifnull(tprac.api_case_execute_result, 'PENDING') as status, count(id) as count from test_plan_report_api_case tprac
         where tprac.test_plan_report_id = #{id}
         group by tprac.api_case_execute_result
     </select>
@@ -25,10 +25,10 @@
     </select>
 
     <select id="list" resultType="io.metersphere.plan.dto.ReportDetailCasePageDTO">
-        <!-- ID、用例名称、所属模块、用例等级、执行人、执行结果、缺陷数 -->
-        select distinct tprac.api_case_id as id, tprac.api_case_num as num, tprac.api_case_name as name,
+        <!-- ID、用例名称、所属模块、用例等级、执行人、执行结果、缺陷数、 接口报告ID -->
+        select tprac.api_case_id as id, tprac.api_case_num as num, tprac.api_case_name as name,
         tprac.api_case_module as moduleName, tprac.api_case_priority as priority, tprac.api_case_execute_report_id reportId,
-        tprac.api_case_execute_result as executeResult, tprac.api_case_execute_user as executeUser, 0 as bugCount
+        ifnull(tprac.api_case_execute_result, 'PENDING') as executeResult, tprac.api_case_execute_user as executeUser, 0 as bugCount
         from test_plan_report_api_case tprac
         where tprac.test_plan_report_id = #{request.reportId}
         <include refid="filter"/>
@@ -45,11 +45,12 @@
             <foreach collection="request.filter.entrySet()" index="key" item="values">
                 <if test="values != null and values.size() > 0">
                     <choose>
-                        <!-- 执行状态 -->
+                        <!-- 执行结果 -->
                         <when test="key == 'executeResult'">
-                            and tprfc.function_case_execute_result in
+                            and tprac.api_case_execute_result in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
+                        <!-- 等级 -->
                         <when test="key == 'priority'">
                             and tprac.api_case_priority in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml
index f14db730d5..540f57eed7 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportApiScenarioMapper.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.plan.mapper.ExtTestPlanReportApiScenarioMapper">
     <select id="countExecuteResult" resultType="io.metersphere.plan.dto.CaseStatusCountMap">
-        select tpras.api_scenario_execute_result as status, count(id) as count from test_plan_report_api_scenario tpras
+        select ifnull(tpras.api_scenario_execute_result, 'PENDING') as status, count(id) as count from test_plan_report_api_scenario tpras
         where tpras.test_plan_report_id = #{id}
         group by tpras.api_scenario_execute_result
     </select>
 
     <select id="getPlanExecuteCases" resultType="io.metersphere.plan.domain.TestPlanReportApiScenario">
         select  tpas.id as testPlanApiScenarioId, aso.id as apiScenarioId, aso.num as apiScenarioNum, aso.name as apiScenarioName, aso.priority as apiScenarioPriority,
-                tpas.test_plan_collection_id testPlanCollectionId, tpas.grouped grouped, tpas.environment_id environmentId,
+                tpas.test_plan_collection_id testPlanCollectionId, tpas.grouped as grouped, tpas.environment_id environmentId,
                 if(aso.module_id = 'root','未规划用例', aso.module_id) as apiScenarioModule, tpas.execute_user as apiScenarioExecuteUser,
-                ifnull(tpas.last_exec_result, 'PENDING') as apiScenarioExecuteResult, tpas.last_exec_report_id apiScenarioExecuteReportId, tpas.pos pos
+                ifnull(tpas.last_exec_result, 'PENDING') as apiScenarioExecuteResult, tpas.last_exec_report_id apiScenarioExecuteReportId, tpas.pos as pos
         from test_plan_api_scenario tpas join api_scenario aso on aso.id = tpas.api_scenario_id
                                      left join api_scenario_module asm on aso.module_id = asm.id
         where tpas.test_plan_id = #{id} and aso.deleted = false
@@ -24,10 +24,10 @@
     </select>
 
     <select id="list" resultType="io.metersphere.plan.dto.ReportDetailCasePageDTO">
-        <!-- ID、用例名称、所属模块、用例等级、执行人、执行结果、缺陷数 -->
+        <!-- ID、用例名称、所属模块、用例等级、执行人、执行结果、缺陷数、报告ID -->
         select distinct tpras.api_scenario_id as id, tpras.api_scenario_num as num, tpras.api_scenario_name as name,
         tpras.api_scenario_module as moduleName, tpras.api_scenario_priority as priority, tpras.api_scenario_execute_report_id reportId,
-        tpras.api_scenario_execute_result as executeResult, tpras.api_scenario_execute_user as executeUser, 0 as bugCount
+        ifnull(tpras.api_scenario_execute_result, 'PENDING') as executeResult, tpras.api_scenario_execute_user as executeUser, 0 as bugCount
         from test_plan_report_api_scenario tpras
         where tpras.test_plan_report_id = #{request.reportId}
         <include refid="filter"/>
@@ -38,11 +38,12 @@
             <foreach collection="request.filter.entrySet()" index="key" item="values">
                 <if test="values != null and values.size() > 0">
                     <choose>
-                        <!-- 执行状态 -->
+                        <!-- 执行结果 -->
                         <when test="key == 'executeResult'">
                             and tpras.api_scenario_execute_result in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
+                        <!-- 等级 -->
                         <when test="key == 'priority'">
                             and tpras.api_scenario_priority in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml
index c6f0800a53..e21589fb48 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportFunctionalCaseMapper.xml
@@ -38,17 +38,17 @@
     </select>
 
     <select id="countExecuteResult" resultType="io.metersphere.plan.dto.CaseStatusCountMap">
-        select tprfc.function_case_execute_result as status, count(id) as count from test_plan_report_function_case tprfc
+        select ifnull(tprfc.function_case_execute_result, 'PENDING') as status, count(id) as count from test_plan_report_function_case tprfc
         where tprfc.test_plan_report_id = #{id}
         group by tprfc.function_case_execute_result
     </select>
 
     <select id="list" resultType="io.metersphere.plan.dto.ReportDetailCasePageDTO">
-        <!-- ID、用例名称、所属模块、用例等级、执行人、执行结果、缺陷数 -->
-        select distinct tprfc.function_case_id as id, tprfc.function_case_num as num, tprfc.function_case_name as name,
-                        tprfc.function_case_module as moduleName, tprfc.function_case_priority as priority,
-                        tprfc.function_case_execute_result as executeResult, tprfc.function_case_execute_user as executeUser,
-                        ifnull(tprfc.function_case_bug_count, 0) as bugCount, tprfc.function_case_execute_report_id reportId
+        <!-- ID、用例名称、所属模块、用例等级、执行人、执行结果、缺陷数、报告ID -->
+        select tprfc.function_case_id as id, tprfc.function_case_num as num, tprfc.function_case_name as name,
+            tprfc.function_case_module as moduleName, tprfc.function_case_priority as priority,
+            ifnull(tprfc.function_case_execute_result, 'PENDING') as executeResult, tprfc.function_case_execute_user as executeUser,
+            ifnull(tprfc.function_case_bug_count, 0) as bugCount, tprfc.function_case_execute_report_id reportId
         from test_plan_report_function_case tprfc
         where tprfc.test_plan_report_id = #{request.reportId}
         <include refid="filter"/>
@@ -64,11 +64,12 @@
             <foreach collection="request.filter.entrySet()" index="key" item="values">
                 <if test="values != null and values.size() > 0">
                     <choose>
-                        <!-- 执行状态 -->
+                        <!-- 执行结果 -->
                         <when test="key == 'executeResult'">
                             and tprfc.function_case_execute_result in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
                         </when>
+                        <!-- 等级 -->
                         <when test="key == 'priority'">
                             and tprfc.function_case_priority in
                             <include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>