From 55ac5e29404dd2e74c77a604a63e4dd991a38bb0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 二月 2026 16:43:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
index 62bc75f..0fa8234 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -6,7 +6,6 @@
 import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
 import com.xiaopeng.api.model.account.XpOperationsUser;
 import com.xiaopeng.api.model.maintenance.*;
-import com.xiaopeng.api.model.maintenance.XpErrorType;
 import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.exception.ServiceException;
@@ -16,21 +15,17 @@
 import com.xiaopeng.maintenance.dto.SaveRoutineDetailDto;
 import com.xiaopeng.maintenance.dto.SaveVehicleAccidentDto;
 import com.xiaopeng.maintenance.mapper.*;
-import com.xiaopeng.maintenance.model.query.WorkBenchQuery;
 import com.xiaopeng.maintenance.model.query.TaskPageListQuery;
+import com.xiaopeng.maintenance.model.query.WorkBenchQuery;
+import com.xiaopeng.maintenance.model.query.XpTaskRecordPageQuery;
+import com.xiaopeng.maintenance.model.vo.*;
 import com.xiaopeng.maintenance.service.XpTaskService;
-import com.xiaopeng.maintenance.model.vo.WorkBenchVO;
-import com.xiaopeng.maintenance.model.vo.TaskAccidentDetailVO;
-import com.xiaopeng.maintenance.model.vo.TaskChargingDetailVO;
-import com.xiaopeng.maintenance.model.vo.TaskPageListVO;
-import com.xiaopeng.maintenance.model.vo.TaskRoutineDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -584,4 +579,8 @@
         return R.ok();
     }
 
+    @Override
+    public PageInfo<XpTaskRecordVO> queryTaskByVehicleId(XpTaskRecordPageQuery query) {
+        return null;
+    }
 }

--
Gitblit v1.7.1