From 86309845c09071a55ead5bb37f600b49d590320f Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 17 Jun 2024 19:45:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E6=89=A7=E8=A1=8C=E5=88=86=E6=9E=90=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/plan/service/TestPlanReportService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
index 493664a4cc..d8bdb1e30f 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
@@ -635,6 +635,7 @@ public class TestPlanReportService {
 	 * @param reportId 报告ID
 	 */
 	public void summaryGroupReport(String reportId) {
+		// TODO: 更新计划组的用例明细执行结果
 		TestPlanReportSummaryExample summaryExample = new TestPlanReportSummaryExample();
 		summaryExample.createCriteria().andTestPlanReportIdEqualTo(reportId);
 		List<TestPlanReportSummary> testPlanReportSummaries = testPlanReportSummaryMapper.selectByExample(summaryExample);
@@ -645,14 +646,14 @@ public class TestPlanReportService {
 		TestPlanReportSummary groupSummary = testPlanReportSummaries.get(0);
 
 		TestPlanReportExample example = new TestPlanReportExample();
-		example.createCriteria().andParentIdEqualTo(reportId);
+		example.createCriteria().andParentIdEqualTo(reportId).andIntegratedEqualTo(false);
 		List<TestPlanReport> testPlanReports = testPlanReportMapper.selectByExample(example);
         if(CollectionUtils.isEmpty(testPlanReports)){
             return;
         }
 		List<String> ids = testPlanReports.stream().map(TestPlanReport::getId).toList();
 		summaryExample.clear();
-		summaryExample.createCriteria().andIdIn(ids);
+		summaryExample.createCriteria().andTestPlanReportIdIn(ids);
 		List<TestPlanReportSummary> summaryList = testPlanReportSummaryMapper.selectByExampleWithBLOBs(summaryExample);
 		List<CaseCount> functionalCaseCountList = new ArrayList<>();
 		List<CaseCount> apiCaseCountList = new ArrayList<>();