From 74666a33cb68e256e7f7b6bf901edb1f789c834e Mon Sep 17 00:00:00 2001 From: Agent Date: Sat, 28 Mar 2026 03:25:40 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=8E=E7=AB=AF=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8C=89=E5=AE=A2=E6=88=B7=E5=A7=93=E5=90=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/building/controller/OrderController.java | 3 ++- .../com/example/building/service/impl/OrderServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/building/controller/OrderController.java b/src/main/java/com/example/building/controller/OrderController.java index 01e5248..186fcca 100644 --- a/src/main/java/com/example/building/controller/OrderController.java +++ b/src/main/java/com/example/building/controller/OrderController.java @@ -52,6 +52,7 @@ public class OrderController { @GetMapping public Result> getOrders( @RequestParam(required = false) String customerId, + @RequestParam(required = false) String customerName, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, @@ -64,7 +65,7 @@ public class OrderController { startDate = systemConfigService.getCustomerOrderStartDate().toString(); } - return Result.success(orderService.getOrders(customerId, status, startDate, endDate, page, pageSize)); + return Result.success(orderService.getOrders(customerId, customerName, status, startDate, endDate, page, pageSize)); } /** diff --git a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java index 5355a9c..4adb6c4 100644 --- a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java @@ -163,12 +163,15 @@ public class OrderServiceImpl implements OrderService { * 获取订单列表 */ @Override - public Page getOrders(String customerId, Integer status, String startDate, String endDate, Integer page, Integer pageSize) { + public Page getOrders(String customerId, String customerName, Integer status, String startDate, String endDate, Integer page, Integer pageSize) { Page pageParam = new Page<>(page, pageSize); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (customerId != null) { wrapper.eq(Order::getCustomerId, customerId); } + if (customerName != null && !customerName.isEmpty()) { + wrapper.like(Order::getCustomerName, customerName); + } if (status != null) { wrapper.eq(Order::getStatus, status); }