`fix`

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblGoodsOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.TblCarSchedule;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.TblGoodsOrderBo;
 import org.dromara.system.domain.vo.TblGoodsOrderVo;
@@ -66,7 +68,16 @@ public class TblGoodsOrderServiceImpl implements ITblGoodsOrderService {
         lqw.eq(bo.getGoodsType() != null, TblGoodsOrder::getGoodsType, bo.getGoodsType());
         lqw.eq(bo.getStatus() != null, TblGoodsOrder::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getFromAddr()), TblGoodsOrder::getFromAddr, bo.getFromAddr());
-        lqw.eq(bo.getGotime() != null, TblGoodsOrder::getGotime, bo.getGotime());
+//        lqw.eq(bo.getGotime() != null, TblGoodsOrder::getGotime, bo.getGotime());
+
+        if(bo.getGotime() != null){
+            String start= DateUtils.dateTime(bo.getGotime()) +" 00:00:00";
+            String end= DateUtils.dateTime(bo.getGotime())+" 23:59:59";
+            lqw.gt(bo.getGotime()!=null, TblGoodsOrder::getGotime, start);
+            lqw.lt(bo.getGotime()!=null, TblGoodsOrder::getGotime, end);
+        }
+
+
         lqw.eq(StringUtils.isNotBlank(bo.getGoodsWeight()), TblGoodsOrder::getGoodsWeight, bo.getGoodsWeight());
         lqw.eq(StringUtils.isNotBlank(bo.getToAddr()), TblGoodsOrder::getToAddr, bo.getToAddr());
         lqw.eq(StringUtils.isNotBlank(bo.getPayType()), TblGoodsOrder::getPayType, bo.getPayType());

ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblTaxiOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.TblGoodsOrder;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.TblTaxiOrderBo;
 import org.dromara.system.domain.vo.TblTaxiOrderVo;
@@ -66,7 +68,14 @@ public class TblTaxiOrderServiceImpl implements ITblTaxiOrderService {
         lqw.eq(bo.getToUserId() != null, TblTaxiOrder::getToUserId, bo.getToUserId());
         lqw.eq(bo.getStatus() != null, TblTaxiOrder::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getFromAddr()), TblTaxiOrder::getFromAddr, bo.getFromAddr());
-        lqw.eq(bo.getGotime() != null, TblTaxiOrder::getGotime, bo.getGotime());
+//        lqw.eq(bo.getGotime() != null, TblTaxiOrder::getGotime, bo.getGotime());
+        if(bo.getGotime() != null){
+            String start= DateUtils.dateTime(bo.getGotime()) +" 00:00:00";
+            String end= DateUtils.dateTime(bo.getGotime())+" 23:59:59";
+            lqw.gt(bo.getGotime()!=null, TblTaxiOrder::getGotime, start);
+            lqw.lt(bo.getGotime()!=null, TblTaxiOrder::getGotime, end);
+        }
+
         lqw.eq(bo.getPeoNum() != null, TblTaxiOrder::getPeoNum, bo.getPeoNum());
         lqw.eq(StringUtils.isNotBlank(bo.getToAddr()), TblTaxiOrder::getToAddr, bo.getToAddr());
         lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblTaxiOrder::getExt1, bo.getExt1());