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 d2fd38f..9e88cba 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 @@ -2,6 +2,7 @@ package com.njzscloud.supervisory.order.pojo.param; import com.njzscloud.supervisory.biz.constant.AuditStatus; import com.njzscloud.supervisory.order.contant.CheckStatus; +import com.njzscloud.supervisory.order.contant.OrderCategory; import com.njzscloud.supervisory.order.contant.OrderViewType; import lombok.Getter; import lombok.Setter; @@ -20,6 +21,10 @@ public class OrderPagingSearchParam { */ private AuditStatus auditStatus; + /** + * 订单类型; 字典代码:order_category + */ + private OrderCategory orderCategory; /** * 订单状态; 字典代码:order_status */ 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 a8067e1..1362459 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 @@ -224,6 +224,7 @@ public class OrderInfoService extends ServiceImpl page = pageParam.toPage(); Long stationId = orderPagingSearchParam.getStationId(); String area = orderPagingSearchParam.getArea(); + OrderCategory orderCategory = orderPagingSearchParam.getOrderCategory(); QueryWrapper ew = Wrappers.query() .eq(stationId != null && stationId > 0, "a.station_id", stationId) .like(StrUtil.isNotBlank(sn), "a.sn", sn) @@ -232,6 +233,7 @@ public class OrderInfoService extends ServiceImpl