wenhongquan 2 лет назад
Родитель
Сommit
6e677a31aa

+ 9 - 2
ruoyi-modules/ruoyi-khy/src/main/java/org/dromara/system/service/impl/TblCarInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.system.domain.GpsData;
+import org.dromara.system.domain.TblCarSchedule;
 import org.dromara.system.mapper.TblGpsDataMapper;
 import org.dromara.util.CamelDataUtil;
 import org.dromara.util.MessageUtils;
@@ -105,8 +106,14 @@ public class TblCarInfoServiceImpl implements ITblCarInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getTrafficAccidentInfo()), TblCarInfo::getTrafficAccidentInfo, bo.getTrafficAccidentInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getViolationInfo()), TblCarInfo::getViolationInfo, bo.getViolationInfo());
         lqw.eq(StringUtils.isNotBlank(bo.getChangeInfo()), TblCarInfo::getChangeInfo, bo.getChangeInfo());
-        lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblCarInfo::getExt1, bo.getExt1());
-        lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblCarInfo::getExt2, bo.getExt2());
+        //lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblCarInfo::getExt1, bo.getExt1());
+        //lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblCarInfo::getExt2, bo.getExt2());
+
+        if(bo.getParams().get("driverInfo")!=null && bo.getParams().get("driverInfo")!=null){
+            lqw.like(bo.getParams().get("driverInfo")!=null, TblCarInfo::getExt2, bo.getParams().get("driverInfo"));
+        }
+
+
         return lqw;
     }