Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateInspectionStatusService.java

@@ -95,7 +95,7 @@ public class UpdateInspectionStatusService {
      * @param status
      */
     public void updateEmergencyStatus(Inspection oldInspection, Integer status) {
-        log.info("修改应急任务数据, type:{}, emergencyDataInspectionId:{}, status={}", oldInspection.getType(), oldInspection.getEmergencyDataInspectionId(), status);
+        log.info("修改应急任务数据, id:{}, type:{}, status={}", oldInspection.getId(), oldInspection.getType(), status);
         Inspection emergencyInspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
                 .eq(Inspection::getEmergencyDataInspectionId, oldInspection.getId())
                 .eq(Inspection::getMark, MarkEnum.VALID.getCode()));
@@ -113,7 +113,7 @@ public class UpdateInspectionStatusService {
         emergencyInspection.setAnalyseStatus(inspection.getAnalyseStatus());
         emergencyInspection.setVideoUrl(inspection.getVideoUrl());
         emergencyInspection.setAiVideoUrl(inspection.getAiVideoUrl());
-        inspectionMapper.updateById(inspection);
+        inspectionMapper.updateById(emergencyInspection);
         log.info("修改应急任务数据完成");
     }
 }