From e0cc37bd6547eefdb78e323da08ac87df3367454 Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Tue, 1 Jul 2025 16:24:11 +0800
Subject: [PATCH] =?UTF-8?q?/*=E7=AE=97=E6=B3=95=E8=BF=9B=E5=BA=A6=E8=A2=AB?=
 =?UTF-8?q?=E6=99=BA=E5=B7=A1=E8=BF=9B=E5=BA=A6=E8=A6=86=E7=9B=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partrolresult/controller/PatrolResultController.java  | 2 +-
 .../inspect/taskstatus/mapper/PatrolTaskStatusMapper.java | 2 ++
 .../taskstatus/service/IPatrolTaskStatusService.java      | 2 ++
 .../service/impl/PatrolTaskStatusServiceImpl.java         | 4 ++++
 .../main/resources/mapper/task/PatrolTaskStatusMapper.xml | 8 ++++++++
 5 files changed, 17 insertions(+), 1 deletion(-)

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 1d700b7..2dc2f5f 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
@@ -1165,7 +1165,7 @@ public class PatrolResultController extends BaseController {
                                                     patrolTaskStatusItem.getTaskPatrolledId(), patrolTaskStatusItem.getTaskProgress(), patrolTaskStatusItem.getTaskState());
                                             PatrolTaskStatus taskStatus = statusList.get(0);
                                             taskStatus.setTaskProgress(patrolTaskStatusItem.getTaskProgress());
-                                            iPatrolTaskStatusService.updatePatrolTaskStatus(taskStatus);
+                                            iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskProgress(taskStatus);
                                         }
                                     } else {
                                         i = iPatrolTaskStatusService.updatePatrolTaskStatus(patrolTaskStatusItem);
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java
index 89eee41..9c7ac25 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java
@@ -22,6 +22,8 @@ public interface PatrolTaskStatusMapper {
 
     int updatePatrolTaskStatus(PatrolTaskStatus patrolTaskStatus);
 
+    int updatePatrolTaskStatusOfTaskProgress(PatrolTaskStatus patrolTaskStatus);
+
     int deletePatrolTaskStatusByLineId(Long lineId);
 
     int deletePatrolTaskStatusByLineIds(Long[] lineIds);
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java
index 4ebc6fa..6b7bda9 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java
@@ -20,6 +20,8 @@ public interface IPatrolTaskStatusService {
 
     int updatePatrolTaskStatus(PatrolTaskStatus status);
 
+    int updatePatrolTaskStatusOfTaskProgress(PatrolTaskStatus patrolTaskStatus);
+
     int deletePatrolTaskStatusByLineIds(Long[] lineIds);
 
     int deletePatrolTaskStatusByLineId(Long lineId);
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java
index 0df755c..668e6a2 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java
@@ -48,6 +48,10 @@ public class PatrolTaskStatusServiceImpl implements IPatrolTaskStatusService {
       return this.patrolTaskStatusMapper.updatePatrolTaskStatus(patrolTaskStatus);
    }
 
+   public int updatePatrolTaskStatusOfTaskProgress(PatrolTaskStatus patrolTaskStatus) {
+      return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskProgress(patrolTaskStatus);
+   }
+
    public int deletePatrolTaskStatusByLineIds(Long[] lineIds) {
       return this.patrolTaskStatusMapper.deletePatrolTaskStatusByLineIds(lineIds);
    }
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 f4d0d68..cfa04a1 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
@@ -250,6 +250,14 @@
         where line_id = #{lineId}
     </update>
 
+    <update id="updatePatrolTaskStatusOfTaskProgress" parameterType="PatrolTaskStatus">
+        update patrol_task_status
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskProgress != null">task_progress = #{taskProgress},</if>
+        </trim>
+        where line_id = #{lineId}
+    </update>
+
     <delete id="deletePatrolTaskStatusByLineId" parameterType="Long">
         delete
         from patrol_task_status