订单搜索修改

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

@@ -24,6 +24,7 @@ import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -94,7 +95,7 @@ public class OrderController extends SuperController<OrderService, Long, Order,
         QueryWrap<Order> wrap = handlerWrapper(null, params);
         LbqWrapper<Order> wrapper = wrap.lambda();
         Order order = BeanUtil.toBean(data, Order.class);
-
+//        DateTimeFormatter timeDtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String[] planStatus = null;
         if(StrUtil.isNotEmpty(order.getPlanStatus())){
             planStatus = order.getPlanStatus().split(",");
@@ -110,8 +111,7 @@ public class OrderController extends SuperController<OrderService, Long, Order,
         wrapper.eq(Order::getSource,order.getSource())
                 .like(Order::getOrderName,order.getOrderName())
                 .in(Order::getPlanStatus,planStatus)
-                .geHeader(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null:LocalDateTime.parse(order.getDeliveryTime_st()))
-                .leFooter(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_ed())?null:LocalDateTime.parse(order.getDeliveryTime_ed()))
+                .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);