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 ffbfd79..65998aa 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 @@ -1686,15 +1686,24 @@ public class OrderInfoService extends ServiceImpl ew = Wrappers.query(); ew.eq(null != searchParam.getStationId() && searchParam.getStationId() > 0, "a.station_id", searchParam.getStationId()); ew.like(StrUtil.isNotBlank(searchParam.getSn()), "a.sn", searchParam.getSn()); ew.like(StrUtil.isNotBlank(searchParam.getLicensePlate()), "d.license_plate", searchParam.getLicensePlate()); ew.like(StrUtil.isNotBlank(searchParam.getPhone()), "a.phone", searchParam.getPhone()); ew.like(StrUtil.isNotBlank(searchParam.getNickname()), "a.contacts", searchParam.getNickname()); + ew.like(StrUtil.isNotBlank(transCompanyName), "g.company_name",transCompanyName); + ew.like(StrUtil.isNotBlank(driverName), "f.driver_name", driverName); ew.ge(startTime != null, "a.create_time", startTime); ew.le(endTime != null, "a.create_time", endTime); + ew.eq(orderCategory != null, "a.order_category", orderCategory); ew.eq(null != searchParam.getTransCompanyId(), "a.trans_company_id", searchParam.getTransCompanyId()); + ew.eq("a.deleted", 0); + ew.eq(StrUtil.isNotBlank(area), "h.area", area); historyEW(searchParam, null, ew); List list = baseMapper.exportList(ew); List detailResults = baseMapper.exportDetailList(ew);