From 13fba7dc8a5f596605ff3d7ea5f182555d70f8da Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Mon, 1 Dec 2025 13:22:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervisory/order/pojo/param/OrderPagingSearchParam.java  | 2 ++
 .../njzscloud/supervisory/order/service/OrderInfoService.java | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java
index 9e88cba..af53689 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/OrderPagingSearchParam.java
@@ -40,6 +40,8 @@ public class OrderPagingSearchParam {
      * 清运公司ID
      */
     private Long transCompanyId;
+    private String transCompanyName;
+    private String driverName;
 
     /**
      * 产品ID
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
index dfec9b9..ffbfd79 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
@@ -228,12 +228,16 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Long stationId = orderPagingSearchParam.getStationId();
         String area = orderPagingSearchParam.getArea();
         OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
+        String transCompanyName = orderPagingSearchParam.getTransCompanyName();
+        String driverName = orderPagingSearchParam.getDriverName();
         QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
                 .eq(stationId != null && stationId > 0, "a.station_id", stationId)
                 .like(StrUtil.isNotBlank(sn), "a.sn", sn)
                 .like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate)
                 .like(StrUtil.isNotBlank(nickname), "a.contacts", nickname)
                 .like(StrUtil.isNotBlank(phone), "a.phone", phone)
+                .like(StrUtil.isNotBlank(transCompanyName), "g.company_name", transCompanyName)
+                .like(StrUtil.isNotBlank(driverName), "f.driver_name", driverName)
                 .ge(startTime != null, "a.create_time", startTime)
                 .le(endTime != null, "a.create_time", endTime)
                 .eq(orderCategory != null, "a.order_category", orderCategory)