From b3a1af32878814163e8bd380e1aa5b984ec91a66 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Tue, 16 Sep 2025 19:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8D=E5=85=B4=E6=8A=A5=E5=91=8A=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partrolresult/service/impl/PatrolResultServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/task/ResultAnalysisMapper.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
index 940e9d8..5abb8d1 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java
@@ -1197,7 +1197,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
         if ("0".equals(exportReportFlag)) {
             // 直导缺陷
             List<ResultAnalysis> qxResultAnalyses = analyses.stream().filter(analysis -> "0".equals(analysis.getResultType())).collect(Collectors.toList());
-            long count = qxResultAnalyses.stream().map(analysis -> analysis.getAlgType() + "|" + analysis.getObjectId()).distinct().count();
+            long count = qxResultAnalyses.stream().map(analysis -> analysis.getAlgType() + "|" + analysis.getObjectId() + "|" + analysis.getTaskPatrolId()).distinct().count();
             return String.format(messageUtils.get("缺陷点位：%d个。"), count);
         } else {
             int totalNum = analyses.size();
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
index 972548f..963a0f1 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml
@@ -142,7 +142,7 @@
     </select>
 
     <select id="selectResultAnalysisListByMainIdsNew" resultMap="ResultAnalysisResult">
-        select b.business_id, b.point_status, b.res_status, b.alg_type,b.result_type,b.objectId
+        select b.business_id, b.point_status, b.res_status, b.alg_type,b.result_type,b.objectId,b.task_patrol_id
         from patrol_result a
         left join result_analysis b on a.line_id = b.business_id
         where a.main_id in