From c87dad1efde30b75b8f21566becf5be3491861fa42fe4ebe4bfe8a2794d1985c Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 26 Nov 2025 11:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95->=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/vo/FeignInspectionSwapOrderVo.java   |  5 +++++
 .../controller/EbikeBikeOrderController.java   | 18 ++++++++++++++++++
 .../model/entity/EbikeBikeOrder.java           |  5 +++++
 .../model/vo/InspectionSwapOrderVo.java        |  2 ++
 .../impl/EbikeBikeOrderServiceImpl.java        |  1 +
 5 files changed, 31 insertions(+)

diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignInspectionSwapOrderVo.java b/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignInspectionSwapOrderVo.java
index 7e76d8d..df4309c 100644
--- a/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignInspectionSwapOrderVo.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignInspectionSwapOrderVo.java
@@ -26,4 +26,9 @@ public class FeignInspectionSwapOrderVo {
 
     @NotNull(message = "故障部位图片不能为空")
     private List<String> fileUrls;
+
+    /**
+     * 故障内容
+     */
+    private String remarks;
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
index 663dc00..777442c 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
@@ -52,6 +52,24 @@ public class EbikeBikeOrderController {
         return JsonResult.success(orderPage);
     }
 
+    /**
+     * 工单详情。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("getInfo")
+    public JsonResult<?> getInfo(PageParam page, Integer orderType,String bikeCode) {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(EBIKE_BIKE_INFO.LOCATION,EBIKE_BIKE_ORDER.ALL_COLUMNS)
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(BikeOrderHandleState.UNPROCESSED))
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType, Objects.nonNull(orderType)))
+                .where(EBIKE_BIKE_ORDER.BIKE_CODE.like(bikeCode, StringUtil.hasText(bikeCode)))
+                .leftJoin(EBIKE_BIKE_INFO).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_BIKE_ORDER.BIKE_CODE));
+        Page<EbikeBikeOrderPageDto> orderPage = ebikeBikeOrderService.pageAs(page.getPage(), queryWrapper, EbikeBikeOrderPageDto.class);
+        return JsonResult.success(orderPage);
+    }
+
     /**
      * 生成换电工单。
      *
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java
index 1ce8d1f..01424a7 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeOrder.java
@@ -112,4 +112,9 @@ public class EbikeBikeOrder implements Serializable {
      */
     private Long siteId;
 
+    /**
+     * 故障描述
+     */
+    private String remarks;
+
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/InspectionSwapOrderVo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/InspectionSwapOrderVo.java
index cadfc3d..be04938 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/vo/InspectionSwapOrderVo.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/vo/InspectionSwapOrderVo.java
@@ -26,4 +26,6 @@ public class InspectionSwapOrderVo {
 
     @NotNull(message = "故障部位图片不能为空")
     private List<String> fileUrls;
+
+    private String remarks;
 }
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
index 8d512de..7a0b34a 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
@@ -98,6 +98,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .orderCode(snowFlakeIDKeyGenerator.nextId())
                 .orderType(BikeOrderType.INSPECTION)
                 .operatorId(bikeInfo.getOperatorId())
+                .remarks(inspectionSwapOrderVo.getRemarks())
                 .build();
         this.mapper.insert(ebikeBikeOrder);
         Long orderId = ebikeBikeOrder.getOrderId();