From 297e64789d01866faaeabd484cbf656a51a60632 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 13 三月 2026 17:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
index 2aa436f..ad69a43 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
@@ -56,20 +56,12 @@
      */
     @ApiOperation(value = "车辆运维-车辆运维-车辆取回", tags = {"运维APP-车辆管理"})
     @PostMapping("/api/v1/vehicleRepair/saveReturnRepair")
-    public R<String> saveReturnRepair(@RequestBody XpVehicleRepairReturnDTO dto) {
-
+    public R<String> saveReturnRepair(@Validated @RequestBody XpVehicleRepairReturnDTO dto) {
         Long id = tokenService.getLoginOperationUser().getId();
         if (dto.getRepairMoney().toString().length() > 200) {
             throw new ServiceException("维修费用不能超过200字符", I18nKeyConstant.REPAIR_MONEY_TOO_LONG);
         }
-        XpVehicleRepair xpVehicleRepair = xpVehicleRepairService.getById(dto.getId());
-        xpVehicleRepair.setVehicleId(null);
-        // 修改车辆取回信息
-        xpVehicleRepair.setRepairMoney(dto.getRepairMoney());
-        xpVehicleRepair.setRepairMoneyDetail(dto.getRepairMoneyDetail());
-        xpVehicleRepair.setReturnUserId(id);
-        xpVehicleRepair.setReturnTime(LocalDateTime.now());
-        xpVehicleRepairService.updateById(xpVehicleRepair);
+        xpVehicleRepairService.saveReturnRepair(dto,id);
         return R.ok();
     }
 

--
Gitblit v1.7.1