From 60d6a56a40be3f1afea37ff97213b8f90113c5ec Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 18 Dec 2025 14:52:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver/controller/DriverController.java | 8 +- .../cst/driver/mapper/DriverMapper.java | 5 +- .../cst/driver/pojo/entity/DriverEntity.java | 6 +- .../driver/pojo/param/DriverQueryParam.java | 27 +++++ .../pojo/result/DriverDetailResult.java | 108 ++++++++++++++++++ .../cst/driver/service/DriverService.java | 6 +- .../service/impl/DriverServiceImpl.java | 18 ++- .../mapper/cst/driver/DriverMapper.xml | 2 +- 8 files changed, 164 insertions(+), 16 deletions(-) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/param/DriverQueryParam.java create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java index 8dd3935..e279c3d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/controller/DriverController.java @@ -4,6 +4,8 @@ import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; +import com.njzscloud.dispose.cst.driver.pojo.param.DriverQueryParam; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; import com.njzscloud.dispose.cst.driver.service.DriverService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -54,7 +56,7 @@ public class DriverController { * 详情 */ @GetMapping("/detail") - public R detail(@RequestParam("id") Long id) { + public R detail(@RequestParam("id") Long id) { return R.success(driverService.detail(id)); } @@ -62,8 +64,8 @@ public class DriverController { * 分页查询 */ @GetMapping("/paging") - public R> paging(PageParam pageParam, DriverEntity driverEntity) { - return R.success(driverService.paging(pageParam, driverEntity)); + public R> paging(PageParam pageParam, DriverQueryParam queryParam) { + return R.success(driverService.paging(pageParam, queryParam)); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java index 3eb8c3d..e38a86d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/mapper/DriverMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,8 +16,8 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DriverMapper extends BaseMapper { - Page paging(Page page, @Param("ew") QueryWrapper ew); + Page paging(Page page, @Param("ew") QueryWrapper ew); - DriverEntity getById(Long id); + DriverDetailResult getById(Long id); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java index c2ccde3..db2b23c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/entity/DriverEntity.java @@ -1,6 +1,5 @@ package com.njzscloud.dispose.cst.driver.pojo.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njzscloud.dispose.common.pojo.entity.BaseEntity; import lombok.Getter; @@ -11,7 +10,7 @@ import lombok.experimental.Accessors; import java.time.LocalDate; /** - * 司机 + * 司机实体（仅包含表字段） * @author ljw */ @Getter @@ -36,9 +35,6 @@ public class DriverEntity extends BaseEntity { */ private Long orgId; - @TableField(exist = false) - private String orgName; - /** * 驾驶证编号 */ 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 new file mode 100644 index 0000000..3f89513 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/param/DriverQueryParam.java @@ -0,0 +1,27 @@ +package com.njzscloud.dispose.cst.driver.pojo.param; + +import lombok.Getter; +import lombok.Setter; + +/** + * 司机分页查询入参 + * + * @author ljw + */ +@Getter +@Setter +public class DriverQueryParam { + + /** + * 是否删除； 0-->未删除、1-->已删除 + * 作为查询条件时，默认按未删除（0）处理 + */ + private Boolean deleted; + + /** + * 司机姓名（模糊查询） + */ + private String driverName; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java new file mode 100644 index 0000000..8946892 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/pojo/result/DriverDetailResult.java @@ -0,0 +1,108 @@ +package com.njzscloud.dispose.cst.driver.pojo.result; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 司机详情/列表返回结果 + * + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class DriverDetailResult { + + /** + * 主键 + */ + private Long id; + + /** + * 归属用户 Id；sys_user.id + */ + private Long userId; + + /** + * 归属客户 Id；cst_customer.id + */ + private Long customerId; + + /** + * 归属公司 Id；cst_org.id + */ + private Long orgId; + + /** + * 归属公司名称 + */ + private String orgName; + + /** + * 驾驶证编号 + */ + private String drivingLicenceNo; + + /** + * 司机姓名 + */ + private String driverName; + + /** + * 手机号 + */ + private String phone; + + /** + * 驾驶证图片 + */ + private String drivingLicence; + + /** + * 驾驶证有效期开始 + */ + private LocalDate licenceStartTime; + + /** + * 驾驶证有效期结束 + */ + private LocalDate licenceEndTime; + + /** + * 忙碌中 + */ + private Boolean busy; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id； sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + + /** + * 是否删除； 0-->未删除、1-->已删除 + */ + private Boolean deleted; +} + + diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java index 5eea05c..cb5ca2a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/driver/service/DriverService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; +import com.njzscloud.dispose.cst.driver.pojo.param.DriverQueryParam; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; import java.util.List; @@ -19,9 +21,9 @@ public interface DriverService extends IService { void del(List ids); - DriverEntity detail(Long id); + DriverDetailResult detail(Long id); - PageResult paging(PageParam pageParam, DriverEntity driverEntity); + PageResult paging(PageParam pageParam, DriverQueryParam queryParam); } 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 ea36a83..e34071b 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 @@ -1,11 +1,15 @@ package com.njzscloud.dispose.cst.driver.service.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.driver.mapper.DriverMapper; import com.njzscloud.dispose.cst.driver.pojo.entity.DriverEntity; +import com.njzscloud.dispose.cst.driver.pojo.param.DriverQueryParam; +import com.njzscloud.dispose.cst.driver.pojo.result.DriverDetailResult; import com.njzscloud.dispose.cst.driver.service.DriverService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -41,12 +45,20 @@ public class DriverServiceImpl extends ServiceImpl i } @Override - public DriverEntity detail(Long id) { + public DriverDetailResult detail(Long id) { return baseMapper.getById(id); } @Override - public PageResult paging(PageParam pageParam, DriverEntity driverEntity) { - return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query(driverEntity))); + public PageResult paging(PageParam pageParam, DriverQueryParam queryParam) { + if (queryParam == null) { + queryParam = new DriverQueryParam(); + } + String driverName = queryParam.getDriverName(); + QueryWrapper ew = Wrappers.query() + .eq("cd.deleted", Boolean.FALSE) + .like(StrUtil.isNotBlank(driverName), "cd.driver_name", driverName); + + return PageResult.of(baseMapper.paging(pageParam.toPage(), ew)); } } diff --git a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml index 8b53589..4374563 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/driver/DriverMapper.xml @@ -2,7 +2,7 @@ - +