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 1bad88c2..b9256d49 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 @@ -1403,12 +1403,21 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl param1 = (Map)param.get("pageParam"); int pageNum = (int) param1.get("pageNum"); int pageSize = (int) param1.get("pageSize"); + String orderType = param.get("orderType")==null?"":param.get("orderType").toString(); + String bikeCode = param.get("bikeCode")==null?"":param.get("bikeCode").toString(); // 创建查询条件 QueryWrapper query = QueryWrapper.create() .select("order_id, bike_code, order_type, created_at, receiver_id, dispatch_type," + " bike_count, longitude, latitude,order_type_name") // 选择需要的字段 .from("v_ebike_work_order_summary") // 指定查询的表 .eq("receiver_id", userId); // 根据当前用户ID过滤数据 + if (bikeCode != null && !bikeCode.isEmpty()) { + query.eq("bike_code", bikeCode); + } + + if (orderType != null && !orderType.isEmpty()) { + query.eq("order_type", orderType); + } // 执行查询,获取工作订单列表 Page resEbikeWorkOrderSummaryDtoPage = ebikeBikeOrderMapper .paginateAs(pageNum,pageSize, query,ResEbikeWorkOrderSummaryDto.class);