From b7bf075a1030f72e91b34f36ce24a46f650445abaf1384fa585601897fdb8acd Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Mon, 9 Feb 2026 16:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operations/model/dto/EbikeOrderBikeListDto.java |  5 +++++
 .../service/impl/EbikeBikeOrderServiceImpl.java     | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeListDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeListDto.java
index 8ae6a68..bdceebb 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeListDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeOrderBikeListDto.java
@@ -99,6 +99,11 @@ public class EbikeOrderBikeListDto implements Serializable {
      */
     private Boolean isInParkingArea;
 
+    /**
+     * 是否用户报修
+     */
+    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 8df50e0..b15b567 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
@@ -537,6 +537,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                         EBIKE_BIKE_INFO.BIKE_CODE,
                         EBIKE_BIKE_INFO.LOCATION,
                         EBIKE_BIKE_INFO.USAGE_STATUS,
+                        EBIKE_BIKE_ORDER.IS_USER_REPORTING,
                         EBIKE_ECU_INFO.ECU_SN,
                         // 判断是否有巡检工单
                         QueryMethods.case_()
@@ -621,15 +622,13 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH))
                 .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode)))
                 .where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus)))
-                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
+                .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
+                .leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));
         if (acceptOrder!=null && acceptOrder){
-            queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
-                    .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
-                    .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
+            queryWrapper.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
         } else if (orderType!=null) {
-            queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
-                    .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
-                    .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));
+            queryWrapper.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));
         }
         List<EbikeOrderBikeListDto> list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class);
         List<String> snList = list.stream().map(EbikeOrderBikeListDto::getEcuSn).toList();