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 ew = Wrappers.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)