From 69b336ba681bcd110a03a3354acfbcd20d37e35c Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Wed, 29 Oct 2025 17:13:01 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=B7=A1=E8=A7=86?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=88=97=E8=A1=A8=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionReportController.java           | 19 +++++++++++--------
 .../task/InspectionReportDataMapper.xml       |  5 +++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/insreport/controller/InspectionReportController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/insreport/controller/InspectionReportController.java
index 93d06e3..c17a5e9 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/insreport/controller/InspectionReportController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/insreport/controller/InspectionReportController.java
@@ -39,6 +39,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.zip.Adler32;
 import java.util.zip.CheckedOutputStream;
 import java.util.zip.ZipEntry;
@@ -98,15 +99,17 @@ public class InspectionReportController extends BaseController {
         Map<String, String> imgMap = getImgMap();
         List<InspectionReport> inspectionReportList = inspectionReportService.selectByAllList(inspectionReport);
         logger.info("[REPORT] inspectionReportList size: {}", inspectionReportList.size());
-        for (InspectionReport report : inspectionReportList) {
-            InspectionReportData inspectionReportData = new InspectionReportData();
-            inspectionReportData.setReportId(String.valueOf(report.getLineId()));
-            List<InspectionReportData> inspectionReportDataList =
-                    inspectionReportDataService.selectInspectionReportDataList(inspectionReportData);
-            if (!inspectionReportDataList.isEmpty()) {
-                report.setInfo(inspectionReportDataList);
+        InspectionReportData reportParam = new InspectionReportData();
+        Map<String, Object> map = new HashMap<>();
+        String[] reportIds = inspectionReportList.stream().map((item) -> item.getLineId().toString()).toArray(String[]::new);
+        map.put("reportIds", reportIds);
+        reportParam.setParams(map);
+        List<InspectionReportData> inspectionReportDataList = inspectionReportDataService.selectInspectionReportDataList(reportParam);
+        for(InspectionReport report : inspectionReportList) {
+            List<InspectionReportData> infoList = inspectionReportDataList.stream().filter(item -> item.getReportId().equals(report.getLineId())).collect(Collectors.toList());
+            if(infoList != null && !infoList.isEmpty()) {
+                report.setInfo(infoList);
             }
-
             for (InspectionReportData reportData : inspectionReportDataList) {
                 if (imgMap != null && imgMap.get((reportData.getLineId()).trim()) != null) {
                     reportData.setInspectionImg(imgMap.get((reportData.getLineId()).trim()));
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportDataMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportDataMapper.xml
index 0dedcfc..96a08bb 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportDataMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportDataMapper.xml
@@ -57,6 +57,11 @@
             <if test="pointStatus != null  and pointStatus != ''">and point_status = #{pointStatus}</if>
             <if test="inspectionImg != null  and inspectionImg != ''">and inspection_img = #{inspectionImg}</if>
             <if test="reportId != null  and reportId != ''">and report_id = #{reportId}</if>
+            <if test="params.reportIds != null  and params.reportIds != ''">and report_id in
+                <foreach collection="params.reportIds" item="reportId" open="(" separator="," close=")">
+                    #{reportId}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="selectListByStatus" parameterType="InspectionReportData" resultMap="InspectionReportDataResult">