/*算法进度被智巡进度覆盖问题修改。*/

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);

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);

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);

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);
    }

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