|
|
@@ -265,8 +265,13 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
|
|
|
queryWrapper.ge("complete_date", workOrderPageParam.getCompleteDateFrom());
|
|
|
queryWrapper.le("complete_date", workOrderPageParam.getCompleteDateTo());
|
|
|
}
|
|
|
- if (workOrderParam.getOrderNo() != null) {
|
|
|
- queryWrapper.eq("order_no", workOrderParam.getOrderNo());
|
|
|
+
|
|
|
+ //根据订单号或者车牌号可以模糊查询,前端传orderNO即可
|
|
|
+ if (StringUtils.isNotBlank(workOrderParam.getOrderNo())) {
|
|
|
+ queryWrapper.like("car_number", workOrderParam.getCarNumber());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(workOrderParam.getOrderNo())) {
|
|
|
+ queryWrapper.like("order_no", workOrderParam.getOrderNo());
|
|
|
}
|
|
|
if (workOrderParam.getOrgId() != null) {
|
|
|
queryWrapper.eq("org_id", workOrderParam.getOrgId());
|