From 6c2cb0555423def96cfabb9897b307a73e735903 Mon Sep 17 00:00:00 2001
From: wangguangyuan <wangguangyuan@163.com>
Date: Mon, 26 May 2025 17:08:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E7=BB=8D=E5=85=B4=E7=AB=99?=
 =?UTF-8?q?=E3=80=91=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=AD=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=B1=BB=E5=9E=8B=E3=80=81=E7=8A=B6=E6=80=81=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/task/PatrolTaskStatusMapper.xml    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
index 752e8da..500b68c 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml
@@ -63,8 +63,24 @@
     </select>
 
     <select id="selectPatrolTaskStatusList" parameterType="PatrolTaskStatus" resultMap="PatrolTaskStatusResult">
-        select a.* from patrol_task_status a
-        LEFT JOIN patrol_task b on a.task_code=b.task_code
+          SELECT
+            a.line_id,
+            a.task_patrolled_id,
+            a.task_name,
+            a.task_code,
+            a.task_state,
+            a.plan_start_time,
+            a.start_time,
+            a.task_progress,
+            a.task_estimated_time,
+            a.description,
+            a.pos_type,
+            a.code,
+            a.pos,
+            a.end_time,
+            b.type as patrol_type,
+            b.execution_status as exec_type from patrol_task_status a
+          LEFT JOIN patrol_task b on a.task_code=b.task_code
         <where>
             <if test="taskPatrolledId != null  and taskPatrolledId != ''">and a.task_patrolled_id = #{taskPatrolledId}
             </if>