订单搜索
parent
0f6db1bc67
commit
13fba7dc8a
|
|
@ -40,6 +40,8 @@ public class OrderPagingSearchParam {
|
||||||
* 清运公司ID
|
* 清运公司ID
|
||||||
*/
|
*/
|
||||||
private Long transCompanyId;
|
private Long transCompanyId;
|
||||||
|
private String transCompanyName;
|
||||||
|
private String driverName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 产品ID
|
* 产品ID
|
||||||
|
|
|
||||||
|
|
@ -228,12 +228,16 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
||||||
Long stationId = orderPagingSearchParam.getStationId();
|
Long stationId = orderPagingSearchParam.getStationId();
|
||||||
String area = orderPagingSearchParam.getArea();
|
String area = orderPagingSearchParam.getArea();
|
||||||
OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
|
OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory();
|
||||||
|
String transCompanyName = orderPagingSearchParam.getTransCompanyName();
|
||||||
|
String driverName = orderPagingSearchParam.getDriverName();
|
||||||
QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
|
QueryWrapper<OrderPagingResult> ew = Wrappers.<OrderPagingResult>query()
|
||||||
.eq(stationId != null && stationId > 0, "a.station_id", stationId)
|
.eq(stationId != null && stationId > 0, "a.station_id", stationId)
|
||||||
.like(StrUtil.isNotBlank(sn), "a.sn", sn)
|
.like(StrUtil.isNotBlank(sn), "a.sn", sn)
|
||||||
.like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate)
|
.like(StrUtil.isNotBlank(licensePlate), "e.license_plate", licensePlate)
|
||||||
.like(StrUtil.isNotBlank(nickname), "a.contacts", nickname)
|
.like(StrUtil.isNotBlank(nickname), "a.contacts", nickname)
|
||||||
.like(StrUtil.isNotBlank(phone), "a.phone", phone)
|
.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)
|
.ge(startTime != null, "a.create_time", startTime)
|
||||||
.le(endTime != null, "a.create_time", endTime)
|
.le(endTime != null, "a.create_time", endTime)
|
||||||
.eq(orderCategory != null, "a.order_category", orderCategory)
|
.eq(orderCategory != null, "a.order_category", orderCategory)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue