|
|
@@ -150,7 +150,7 @@ public class ExportOrderController extends BladeController {
|
|
|
lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()), Order::getOrderRemark, order.getOrderRemark());//备注
|
|
|
lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderStatus()), Order::getOrderStatus, order.getOrderStatus());
|
|
|
if ("1".equals(order.getTabType())) {
|
|
|
- lambdaQueryWrapper.eq(Order::getDocumentaryStatus, "寄单");
|
|
|
+ lambdaQueryWrapper.eq(Order::getOrderStatus, "已完成");
|
|
|
} else if ("2".equals(order.getTabType())) {
|
|
|
lambdaQueryWrapper.apply("(documentary_status is null or documentary_status != '寄单' ) and order_status != '已取消' and order_status != '录入'");
|
|
|
} else if ("3".equals(order.getTabType())) {
|