From ffe8ffcdf9355009a34e1ee1b7d6e5048e2a6d49 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Fri, 22 Aug 2025 09:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=8A=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeBikeInfoServiceImpl.java            | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index 04b71e17..f6741bc1 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -1357,10 +1357,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 .leftJoin(EBIKE_CAR_STATUS_INFO).on(EBIKE_BIKE_INFO.STATE.eq(EBIKE_CAR_STATUS_INFO.CODE))
                 .leftJoin(EBIKE_DISPATCH_RECORDS).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_DISPATCH_RECORDS.BIKE_CODE)
                 .and(EBIKE_DISPATCH_RECORDS.DISPATCH_STATE.eq(0)))
+                .where(EBIKE_BIKE_INFO.BIKE_CODE.like(queryParam.getBikeCode(), StringUtil.hasText(queryParam.getBikeCode())))
+                .where(EBIKE_BIKE_CHECKIN.OPERATE_TIME.ge(queryParam.getEnterTime(), queryParam.getEnterTime() != null))
                 .groupBy(EBIKE_BIKE_INFO.BIKE_ID);
         query.select(
                 case_()
-                        .when(EBIKE_DISPATCH_RECORDS.BIKE_CODE.isNotNull())
+                        .when(EBIKE_DISPATCH_RECORDS.BIKE_CODE.isNull())
                         .then("投放中")
                         .else_(case_()
                                 .when(EBIKE_CAR_STATUS_INFO.NAMEYW.isNull()).then(EBIKE_CAR_STATUS_INFO.NAMEYY)
@@ -1369,8 +1371,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                         .end().as("state_name")
         );
 
-        query.where(EBIKE_BIKE_INFO.BIKE_CODE.like(queryParam.getBikeCode(), StringUtil.hasText(queryParam.getBikeCode())));
-
         if (queryParam.getState() != null && !queryParam.getState().isEmpty()) {
             String[] stateList = queryParam.getState().split(",");
             if (stateList.length == 1) {
@@ -1380,8 +1380,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             }
         }
 
-        query.where(EBIKE_BIKE_CHECKIN.OPERATE_TIME.ge(queryParam.getEnterTime(), queryParam.getEnterTime() != null));
-
         return ebikeBikeInfoMapper.paginateAs(queryParam.getPageParam().getPage(), query, ResInventoryBikeListDto.class);
     }