From 7c52f40c7c6f7b82e5d4b7d2e87c6c1150e7fc2a915efb03544522f81442af44 Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Mon, 9 Feb 2026 15:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E7=94=9F=E6=88=90=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operations/model/entity/EbikeBikeOrder.java  |  6 ++++++
 .../model/vo/InspectionSwapOrderVo.java          |  2 ++
 .../service/impl/EbikeBikeOrderServiceImpl.java  | 16 +++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

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 84d2738..1e89bdf 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
@@ -120,4 +120,10 @@ public class EbikeBikeOrder implements Serializable {
      * 是否故障误报
      */
     private Boolean faultFalseAlarm;
+
+
+    /**
+     * 是否故障误报
+     */
+    private Boolean isUserReporting;
 }
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 be04938..22257bf 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
@@ -28,4 +28,6 @@ public class InspectionSwapOrderVo {
     private List<String> fileUrls;
 
     private String remarks;
+
+    private Boolean isUserReporting;
 }
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 a51aa43..8df50e0 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
@@ -163,6 +163,11 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .remarks(inspectionSwapOrderVo.getRemarks())
                 .handleState(OrderHandleState.UNPROCESSED)
                 .build();
+        if (inspectionSwapOrderVo.getIsUserReporting()!=null && inspectionSwapOrderVo.getIsUserReporting()){
+            ebikeBikeOrder.setIsUserReporting(Boolean.TRUE);
+        }else {
+            ebikeBikeOrder.setIsUserReporting(Boolean.FALSE);
+        }
         this.mapper.insert(ebikeBikeOrder);
         Long orderId = ebikeBikeOrder.getOrderId();
         List<Integer> parts = inspectionSwapOrderVo.getParts();
@@ -541,7 +546,16 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                                                 .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
                                                 .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
                                 ))
-                                .then(true)
+                                .then(
+                                        QueryWrapper.create()
+                                                .select(EBIKE_BIKE_ORDER.IS_USER_REPORTING)
+                                                .from(EBIKE_BIKE_ORDER)
+                                                .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                                                .and(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
+                                                // 如果有多个巡检工单，可以添加排序和 limit 1
+                                                .orderBy(EBIKE_BIKE_ORDER.CREATED_AT.desc())
+                                                .limit(1)
+                                )
                                 .else_(false)
                                 .end().as(EbikeOrderBikeListDto::getHasInspectionOrder),
                         // 判断是否有换电工单