From ef6b9879014d51b5eb6f2327ef81dedb4f28343d Mon Sep 17 00:00:00 2001
From: lijw <lijw@123.com>
Date: Tue, 18 Mar 2025 11:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partrolresult/controller/PatrolResultController.java     | 2 +-
 .../main/resources/mapper/task/InspectionReportMapper.xml    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
index c46dd6b..de3a22e 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
@@ -716,7 +716,7 @@ public class PatrolResultController extends BaseController {
             String[] strings = new String[1];
             List<String> algIds = new ArrayList<>();
 
-            logger.info("map: " + map.toString());
+            logger.info("map: " + map);
             if (map != null) {
                 String subIdStr = map.get("alg_subtype_ids");
                 if (subIdStr.contains(StringUtils.COMMA)) {
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml
index 26f4075..3daa454 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportMapper.xml
@@ -77,7 +77,7 @@
     <select id="selectByAllList" parameterType="InspectionReport" resultMap="InspectionReportResult">
         select a.* from inspection_report a
         left JOIN patrol_task b on a.task_id=b.task_id
-        left join basedata_device c on b.device_list = c.device_id
+        left JOIN basedata_device c on b.device_list = c.device_id
         left JOIN basedata_area d on b.area_id =d.area_id
         left JOIN basedata_eqpbook e on find_in_set( e.patrol_device_code, b.dev_no )
         <where>
@@ -97,8 +97,7 @@
                 concat('%',#{inspectionTaskName},'%')
             </if>
         </where>
-        GROUP BY a.line_id
-        ORDER BY a.line_id desc
+        ORDER BY a.inspection_date DESC
     </select>
 
     <select id="selectInspectionReportByLineId" parameterType="Long" resultMap="InspectionReportResult">