diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/param/DriverQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/param/DriverQueryParam.java index e9143c9..1cd9487 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/param/DriverQueryParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/param/DriverQueryParam.java @@ -21,6 +21,8 @@ public class DriverQueryParam { * 司机姓名(模糊查询) */ private String driverName; + + private String keywords; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java index 267d39d..5c6f3c8 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/impl/DriverServiceImpl.java @@ -88,14 +88,17 @@ public class DriverServiceImpl extends ServiceImpl i @Override public PageResult paging(PageParam pageParam, DriverQueryParam queryParam) { - if (queryParam == null) { - queryParam = new DriverQueryParam(); - } String driverName = queryParam.getDriverName(); + String keywords = queryParam.getKeywords(); + QueryWrapper ew = Wrappers.query() .eq("cd.deleted", Boolean.FALSE) .eq(queryParam.getBusy() != null, "cd.busy", queryParam.getBusy()) - .like(StrUtil.isNotBlank(driverName), "cd.driver_name", driverName); + .like(StrUtil.isNotBlank(driverName), "cd.driver_name", driverName) + .and(StrUtil.isNotBlank(keywords), it -> it + .like("cd.driver_name", keywords) + .or().like("cd.phone", keywords) + ); return PageResult.of(baseMapper.paging(pageParam.toPage(), ew)); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/param/ProjectQueryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/param/ProjectQueryParam.java index 9ccd3ab..220b01f 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/param/ProjectQueryParam.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/pojo/param/ProjectQueryParam.java @@ -12,12 +12,6 @@ import lombok.Setter; @Setter public class ProjectQueryParam { - /** - * 是否删除; 0-->未删除、1-->已删除 - * 作为查询条件时,默认按未删除(0)处理 - */ - private Boolean deleted; - /** * 项目名称(模糊查询) */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java index 432c997..2c24d2e 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/project/service/impl/ProjectServiceImpl.java @@ -74,9 +74,6 @@ public class ProjectServiceImpl extends ServiceImpl paging(PageParam pageParam, ProjectQueryParam queryParam) { - if (queryParam == null) { - queryParam = new ProjectQueryParam(); - } String projectName = queryParam.getProjectName(); QueryWrapper ew = Wrappers.query() diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java index fcf66c8..99b2e44 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/truck/service/impl/TruckServiceImpl.java @@ -1,5 +1,6 @@ package com.njzscloud.dispose.cst.truck.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.core.ex.Exceptions; @@ -9,7 +10,6 @@ import com.njzscloud.common.security.util.SecurityUtil; import com.njzscloud.dispose.cst.truck.mapper.TruckMapper; import com.njzscloud.dispose.cst.truck.pojo.entity.TruckEntity; import com.njzscloud.dispose.cst.truck.service.TruckService; -import com.njzscloud.dispose.sys.auth.pojo.result.IdentityInfo; import com.njzscloud.dispose.sys.auth.pojo.result.MyResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -89,7 +89,10 @@ public class TruckServiceImpl extends ServiceImpl impl @Override public PageResult paging(PageParam pageParam, TruckEntity truckEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(truckEntity))); + String licensePlate = truckEntity.getLicensePlate(); + return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() + .like(StrUtil.isNotBlank(licensePlate), TruckEntity::getLicensePlate, licensePlate) + )); } }