From 076bef092bcb69349beddab73e5a21aa8e51d792 Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Mon, 9 Feb 2026 14:59:30 +0800
Subject: [PATCH] =?UTF-8?q?/*=E4=BC=98=E5=8C=96selectOilResultValue?=
 =?UTF-8?q?=E5=92=8Cselect6FsResultValue=EF=BC=8C=E5=B0=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=9F=E5=BA=A6=E4=BB=8E17=E7=A7=92=E5=B7=A6?=
 =?UTF-8?q?=E5=8F=B3=E6=8F=90=E5=8D=87=E5=88=B03=E7=A7=92=E5=B7=A6?=
 =?UTF-8?q?=E5=8F=B3=E3=80=82*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/task/PatrolResultMapper.xml        | 106 ++++++++++--------
 1 file changed, 62 insertions(+), 44 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
index 2ec06a8..fb0e2d9 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
@@ -874,6 +874,7 @@
         <result property="lineId" column="line_id"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
+
 <!--    <select id="selectOilResultValue" parameterType="PatrolResult" resultMap="ResultValue">-->
 
 <!--        SELECT-->
@@ -911,8 +912,8 @@
 <!--        ORDER BY-->
 <!--        d.area_name,-->
 <!--        d.patrol_device_name-->
-
 <!--    </select>-->
+
     <select id="selectOilResultValue" parameterType="PatrolResult" resultMap="ResultValue">
         SELECT
         a.patrol_point_id,
@@ -920,41 +921,49 @@
         d.patrol_device_name,
         f.patrol_point_name,
         CASE
-        WHEN e.`value` = 'check image' THEN '0'
-        ELSE e.`value`
+        WHEN e.value = 'check image' THEN '0'
+        ELSE e.value
         END AS `value`,
         h.dict_value AS line_id,
         e.create_time,
         a.channel_code
         FROM patrol_preset_pos a
-        LEFT JOIN patrol_result e
-        ON a.patrol_point_id = e.device_id
-        RIGHT JOIN (
-        SELECT
-        MAX(h.line_id) AS line_id
-        FROM patrol_result h
-        <where>
-            <if test="createTime != null">
-                h.create_time <![CDATA[>=]]> DATE(#{createTime})
-                AND h.create_time <![CDATA[<]]> DATE_ADD(DATE(#{createTime}), INTERVAL 1 DAY)
-            </if>
-        </where>
-        GROUP BY h.device_id
-        ) i ON e.line_id = i.line_id
-        RIGHT JOIN (
-        SELECT g.dict_value, g.dict_label
-        FROM sys_dict_data g
-        WHERE g.dict_type = 'oil_api'
+
+        INNER JOIN (
+        SELECT dict_label, dict_value
+        FROM sys_dict_data
+        WHERE dict_type = 'oil_api'
         ) h ON h.dict_label = a.patrol_point_id
+
         LEFT JOIN basedata_eqpbook d
         ON a.eqp_book_id = d.eqp_book_id
+
         LEFT JOIN basedata_patrolpoint f
         ON a.patrol_point_id = f.patrol_point_id
+
+        LEFT JOIN (
+        SELECT *
+        FROM (
+        SELECT
+        *,
+        ROW_NUMBER() OVER (PARTITION BY device_id ORDER BY line_id DESC) AS rn
+        FROM patrol_result
+        <where>
+            <if test="createTime != null">
+                create_time <![CDATA[>=]]> DATE(#{createTime})
+                AND create_time <![CDATA[<]]> DATE_ADD(DATE(#{createTime}), INTERVAL 1 DAY)
+            </if>
+        </where>
+        ) t
+        WHERE rn = 1
+        ) e ON a.patrol_point_id = e.device_id
+
         ORDER BY
         d.area_name,
         d.patrol_device_name
     </select>
 
+
 <!--    <select id="select6FsResultValue" parameterType="PatrolResult" resultMap="ResultValue">-->
 
 <!--        SELECT-->
@@ -994,47 +1003,56 @@
 <!--        d.patrol_device_name-->
 
 <!--    </select>-->
-
     <select id="select6FsResultValue" parameterType="PatrolResult" resultMap="ResultValue">
-
         SELECT
         a.patrol_point_id,
         d.area_name,
         d.patrol_device_name,
         f.patrol_point_name,
         CASE
-        WHEN e.`value` = 'check image' THEN
-        '0' ELSE e.`value`
-        END `value`,
-        h.dict_value line_id,
+        WHEN e.value = 'check image' THEN '0'
+        ELSE e.value
+        END AS `value`,
+        h.dict_value AS line_id,
         e.create_time,
         a.channel_code
-        FROM
-        patrol_preset_pos a
-        LEFT JOIN patrol_result e ON a.patrol_point_id = e.device_id
-        RIGHT JOIN (
+        FROM patrol_preset_pos a
+
+        INNER JOIN (
+        SELECT dict_label, dict_value
+        FROM sys_dict_data
+        WHERE dict_type = 'sf6_api'
+        ) h ON h.dict_label = a.patrol_point_id
+
+        LEFT JOIN basedata_eqpbook d
+        ON a.eqp_book_id = d.eqp_book_id
+
+        LEFT JOIN basedata_patrolpoint f
+        ON a.patrol_point_id = f.patrol_point_id
+
+        LEFT JOIN (
+        SELECT *
+        FROM (
         SELECT
-        MAX( h.line_id ) line_id
-        FROM
-        patrol_result h
+        *,
+        ROW_NUMBER() OVER (PARTITION BY device_id ORDER BY line_id DESC) AS rn
+        FROM patrol_result
         <where>
             <if test="createTime != null">
-                h.create_time <![CDATA[>=]]> DATE(#{createTime})
-                AND h.create_time <![CDATA[<]]> DATE_ADD(DATE(#{createTime}), INTERVAL 1 DAY)
+                create_time <![CDATA[>=]]> DATE(#{createTime})
+                AND create_time <![CDATA[<]]> DATE_ADD(DATE(#{createTime}), INTERVAL 1 DAY)
             </if>
         </where>
-        GROUP BY
-        h.device_id
-        ) i ON e.line_id = i.line_id
-        RIGHT JOIN ( SELECT g.dict_value, g.dict_label FROM sys_dict_data g WHERE g.dict_type = 'sf6_api' ) h ON
-        h.dict_label = a.patrol_point_id
-        LEFT JOIN basedata_eqpbook d ON a.eqp_book_id = d.eqp_book_id
-        LEFT JOIN basedata_patrolpoint f ON a.patrol_point_id = f.patrol_point_id
+        ) t
+        WHERE rn = 1
+        ) e ON a.patrol_point_id = e.device_id
+
         ORDER BY
         d.area_name,
         d.patrol_device_name
-
     </select>
+
+
     <select id="queryNumTypeResult" resultMap="PatrolResultResult">
         select *
         from patrol_result