`fix 货物与排班查询接口`

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

@@ -93,6 +93,12 @@ public class TblCarScheduleServiceImpl implements ITblCarScheduleService {
                 lqw.gt(bo.getParams().get("starttime")!=null, TblCarSchedule::getScheduleDate, bo.getParams().get("starttime"));
                 lqw.lt(bo.getParams().get("endtime")!=null, TblCarSchedule::getScheduleDate, bo.getParams().get("endtime"));
             }
+            if(bo.getParams().get("driverInfo")!=null){
+
+
+                lqw.apply(StringUtils.format("path_info->'$.driverInfo'={}",bo.getParams().get("driverInfo")));
+
+            }
 
 
         }

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

@@ -82,8 +82,18 @@ public class TblGoodsOrderServiceImpl implements ITblGoodsOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getToAddr()), TblGoodsOrder::getToAddr, bo.getToAddr());
         lqw.eq(StringUtils.isNotBlank(bo.getPayType()), TblGoodsOrder::getPayType, bo.getPayType());
         lqw.eq(StringUtils.isNotBlank(bo.getGoodsDes()), TblGoodsOrder::getGoodsDes, bo.getGoodsDes());
-        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblGoodsOrder::getExt1, bo.getExt1());
-        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblGoodsOrder::getExt2, bo.getExt2());
+//        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblGoodsOrder::getExt1, bo.getExt1());
+//        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblGoodsOrder::getExt2, bo.getExt2());
+
+
+        if(bo.getParams() != null&& bo.getParams().size()>0){
+            if(bo.getParams().get("scheduleId")!=null){
+
+
+                lqw.apply(StringUtils.format("ext1->'$.schedule_id'={}",bo.getParams().get("scheduleId")));
+
+            }
+        }
         return lqw;
     }