From 86b822af8c286397553711c062aad5bbb748adb01a13d8bdb997a1e9b66d9989 Mon Sep 17 00:00:00 2001 From: PC <2413103649@qq.com> Date: Wed, 21 Jan 2026 14:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cdzy/operations/controller/EbikeBikeOrderController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ce88b79..1f47f95 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 @@ -65,13 +65,13 @@ public class EbikeBikeOrderController { * @return 分页对象 */ @GetMapping("pageByStaff") - public JsonResult pageByStaff(PageParam page, Integer orderType, String bikeCode) { + public JsonResult pageByStaff(PageParam page, Integer orderType, String bikeCode,Integer handelSate) { QueryWrapper queryWrapper = QueryWrapper.create() .select(EBIKE_BIKE_INFO.LOCATION, EBIKE_BIKE_ORDER.ALL_COLUMNS) .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType, Objects.nonNull(orderType))) .where(EBIKE_BIKE_ORDER.BIKE_CODE.like(bikeCode, StringUtil.hasText(bikeCode))) .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong())) - .and(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.VOIDED))) + .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(handelSate,Objects.nonNull(handelSate))) .leftJoin(EBIKE_BIKE_INFO).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_BIKE_ORDER.BIKE_CODE)) .orderBy(EBIKE_BIKE_ORDER.CREATED_AT.desc()); Page orderPage = ebikeBikeOrderService.pageAs(page.getPage(), queryWrapper, EbikeBikeOrderPageDto.class);