绍兴报告合并问题

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();

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