From faecd5586b04a94f7250b4b5c125a7d8055743e9 Mon Sep 17 00:00:00 2001 From: 18980591175 <470162950@qq.com> Date: Tue, 26 May 2026 16:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=B8=89=E6=A3=80=E5=88=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HotVehicleThreeInspectController.java | 10 ++ .../vo/HotVehicleThreeInspectProcessVo.java | 80 ++++++++++++++ .../mapper/HotVehicleThreeInspectMapper.java | 14 +++ .../IHotVehicleThreeInspectService.java | 10 ++ .../HotVehicleThreeInspectServiceImpl.java | 14 +++ .../HotVehicleThreeInspectMapper.xml | 102 ++++++++++++++++++ 6 files changed, 230 insertions(+) create mode 100644 src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectProcessVo.java diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/controller/HotVehicleThreeInspectController.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/controller/HotVehicleThreeInspectController.java index 334cd4c..b483c3c 100644 --- a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/controller/HotVehicleThreeInspectController.java +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/controller/HotVehicleThreeInspectController.java @@ -2,6 +2,7 @@ package com.hotwj.platform.config.vehicleThreeInspect.controller; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBo; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBatchAuditBo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectProcessVo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectVo; import com.hotwj.platform.config.vehicleThreeInspect.service.IHotVehicleThreeInspectPrintService; import com.hotwj.platform.config.vehicleThreeInspect.service.IHotVehicleThreeInspectService; @@ -54,6 +55,15 @@ public class HotVehicleThreeInspectController extends BaseController { return hotVehicleThreeInspectService.queryPageList(bo, pageQuery); } + /** + * 查询车辆三检流程列表 + */ + @GetMapping("/listProcess") + @Operation(summary = "分页查询车辆三检流程列表") + public TableDataInfo listProcess(HotVehicleThreeInspectBo bo, PageQuery pageQuery) { + return hotVehicleThreeInspectService.queryProcessPageList(bo, pageQuery); + } + /** * 查询可进行三检的车辆列表 */ diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectProcessVo.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectProcessVo.java new file mode 100644 index 0000000..6b14011 --- /dev/null +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectProcessVo.java @@ -0,0 +1,80 @@ +package com.hotwj.platform.config.vehicleThreeInspect.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 车辆三检流程列表视图对象 + * + * @author shihongwei + * @date 2025-12-29 + */ +@Data +public class HotVehicleThreeInspectProcessVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 三检流程ID + */ + private Long inspectId; + + /** + * 公司ID + */ + private Long companyId; + + /** + * 车辆ID + */ + private Long vehicleId; + + /** + * 车牌号 + */ + private String plateNumber; + + /** + * 检查者姓名 + */ + private String driverName; + + /** + * 流程开始时间 + */ + private Date startTime; + + /** + * 流程结束时间 + */ + private Date endTime; + + /** + * 流程时间展示 + */ + private String inspectTime; + + /** + * 完成状态 + */ + private String completeStatus; + + /** + * 是否已完成 + */ + private Boolean completed; + + /** + * 审核完成状态 + */ + private String auditCompleteStatus; + + /** + * 是否完成审核 + */ + private Boolean auditCompleted; +} diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/mapper/HotVehicleThreeInspectMapper.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/mapper/HotVehicleThreeInspectMapper.java index 207910c..fd241fc 100644 --- a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/mapper/HotVehicleThreeInspectMapper.java +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/mapper/HotVehicleThreeInspectMapper.java @@ -2,8 +2,10 @@ package com.hotwj.platform.config.vehicleThreeInspect.mapper; import com.hotwj.platform.config.vehicleThreeInspect.domain.HotVehicleThreeInspect; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectProcessVo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectPrintVo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectVo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -27,4 +29,16 @@ public interface HotVehicleThreeInspectMapper extends BaseMapperPlus selectPrintList(@Param("bo") HotVehicleThreeInspectBo bo); + /** + * 分页查询车辆三检流程列表 + * + * @param page 分页参数 + * @param bo 查询条件 + * @return 流程分页列表 + */ + Page queryProcessPageList( + Page page, + @Param("bo") HotVehicleThreeInspectBo bo + ); + } diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/IHotVehicleThreeInspectService.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/IHotVehicleThreeInspectService.java index b9d967e..d121335 100644 --- a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/IHotVehicleThreeInspectService.java +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/IHotVehicleThreeInspectService.java @@ -2,6 +2,7 @@ package com.hotwj.platform.config.vehicleThreeInspect.service; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBo; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBatchAuditBo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectProcessVo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectVo; import com.hotwj.platform.resourceManagement.vehicleManagement.domain.vo.HotVehicleVo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -43,6 +44,15 @@ public interface IHotVehicleThreeInspectService { */ TableDataInfo queryPageList(HotVehicleThreeInspectBo bo, PageQuery pageQuery); + /** + * 分页查询车辆三检流程列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 车辆三检流程分页列表 + */ + TableDataInfo queryProcessPageList(HotVehicleThreeInspectBo bo, PageQuery pageQuery); + /** * 查询符合条件的车辆三检列表 * diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/impl/HotVehicleThreeInspectServiceImpl.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/impl/HotVehicleThreeInspectServiceImpl.java index 6593b98..46ec949 100644 --- a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/impl/HotVehicleThreeInspectServiceImpl.java +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/service/impl/HotVehicleThreeInspectServiceImpl.java @@ -8,6 +8,7 @@ import com.hotwj.platform.common.helper.DriverLoginContextHelper; import com.hotwj.platform.config.vehicleThreeInspect.domain.HotVehicleThreeInspect; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBatchAuditBo; import com.hotwj.platform.config.vehicleThreeInspect.domain.bo.HotVehicleThreeInspectBo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectProcessVo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectVo; import com.hotwj.platform.config.vehicleThreeInspectConfig.domain.HotVehicleThreeInspectConfig; import com.hotwj.platform.config.vehicleThreeInspectConfig.mapper.HotVehicleThreeInspectConfigMapper; @@ -145,6 +146,19 @@ public class HotVehicleThreeInspectServiceImpl implements IHotVehicleThreeInspec return TableDataInfo.build(result); } + /** + * 分页查询车辆三检流程列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 车辆三检流程分页列表 + */ + @Override + public TableDataInfo queryProcessPageList(HotVehicleThreeInspectBo bo, PageQuery pageQuery) { + Page result = baseMapper.queryProcessPageList(pageQuery.build(), bo); + return TableDataInfo.build(result); + } + /** * 查询符合条件的车辆三检列表 * diff --git a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml index ee24695..8e7b249 100644 --- a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml +++ b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml @@ -4,6 +4,108 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +