From 5ffda827817c605df386315bdb9f142f5191e7cb Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 25 Nov 2024 19:18:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BB=84=E6=8A=A5=E5=91=8A=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E6=98=8E=E7=BB=86=E6=9C=AA=E5=88=86=E7=BB=84=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1049478 --user=宋昌昌 【测试计划】计划组-执行计划组-计划组内两个子计划关联了同一个缺陷-查看计划组报告-缺陷明细显示了两个缺陷 https://www.tapd.cn/55049933/s/1617111
---
 .../metersphere/plan/controller/TestPlanReportController.java | 4 ++--
 .../io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java
index 3b419883f8..91b0503ac6 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java
@@ -173,10 +173,10 @@ public class TestPlanReportController {
     public Pager<List<BugDTO>> pageBug(@Validated @RequestBody TestPlanReportDetailPageRequest request) {
         request.setDetailReportIds(testPlanReportService.getActualReportIds(request.getReportId()));
         Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
-                StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "tprb.bug_num, tprb.id desc");
+                StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "tprb.bug_num desc");
         if (!request.getStartPager()) {
             page.close();
-            page.setOrderBy("tprb.bug_num, tprb.id desc");
+            page.setOrderBy("tprb.bug_num desc");
         }
         return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailBugs(request));
     }
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml
index e8260459c0..c17c3428bf 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml
@@ -24,7 +24,7 @@
 
     <select id="list" resultType="io.metersphere.bug.dto.response.BugDTO">
         select distinct tprb.bug_id as id, tprb.bug_num as num, tprb.bug_title as title, tprb.bug_status as status, tprb.bug_status as statusName, tprb.bug_handle_user as handleUserName,
-            ifnull(tprb.bug_case_count, 0) as relationCaseCount
+            sum(ifnull(tprb.bug_case_count, 0)) as relationCaseCount
         from test_plan_report_bug tprb
         where tprb.test_plan_report_id in
         <foreach collection="request.detailReportIds" item="id" open="(" close=")" separator=",">
@@ -33,6 +33,7 @@
         <if test="request.keyword != null and request.keyword != ''">
             and (tprb.bug_num like concat('%', #{request.keyword}, '%') or tprb.bug_title like concat('%', #{request.keyword}, '%'))
         </if>
+        group by tprb.bug_id, tprb.bug_num
     </select>
 
     <select id="countBug" resultType="io.metersphere.plan.dto.ReportBugSumDTO">