订单搜索修改

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderController.java

@@ -109,10 +109,12 @@ public class OrderController extends SuperController<OrderService, Long, Order,
                 if("1".equals(order.getSource()) && "1".equals(order.getOrderStatus())){
                     wrapper.isNull(Order::getAuditStatus);
                 }
+                if(StrUtil.isNotEmpty(order.getDeliveryTime_st())){
+                    wrapper.between(Order::getDeliveryTime, DateUtil.stringToDate3(order.getDeliveryTime_st()),DateUtil.stringToDate3(order.getDeliveryTime_ed()));
+                }
         wrapper.eq(Order::getSource,order.getSource())
                 .like(Order::getOrderName,order.getOrderName())
                 .in(Order::getPlanStatus,planStatus)
-                .between(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null:DateUtil.stringToDate3(order.getDeliveryTime_st()),StrUtil.isEmpty(order.getDeliveryTime_ed())?null:DateUtil.stringToDate3(order.getDeliveryTime_ed()))
                 .orderByDesc(Order::getPrority)
                 .orderByDesc(Order::getCreateTime);
         IPage<Order> ipage = baseService.pageList(page,order.getCustDesc(), wrapper);