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 b483c3c..ed15f84 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 @@ -3,6 +3,9 @@ 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.bo.HotVehicleThreeInspectVehicleQueryBo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectReceivedVehicleVo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectUnreceivedVehicleVo; 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; @@ -73,6 +76,24 @@ public class HotVehicleThreeInspectController extends BaseController { return R.ok(hotVehicleThreeInspectService.queryAvailableVehicles(companyId)); } + /** + * 查询所有三检未收车的车辆列表 + */ + @GetMapping("/unreceivedVehicles") + @Operation(summary = "查询所有三检还未收车的车辆列表") + public R> queryUnreceivedVehicles(HotVehicleThreeInspectVehicleQueryBo bo) { + return R.ok(hotVehicleThreeInspectService.queryUnreceivedVehicles(bo)); + } + + /** + * 查询所有三检已收车的车辆列表 + */ + @GetMapping("/receivedVehicles") + @Operation(summary = "查询所有三检已收车的车辆列表") + public R> queryReceivedVehicles(HotVehicleThreeInspectVehicleQueryBo bo) { + return R.ok(hotVehicleThreeInspectService.queryReceivedVehicles(bo)); + } + /** * 导出车辆三检列表 */ diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/bo/HotVehicleThreeInspectVehicleQueryBo.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/bo/HotVehicleThreeInspectVehicleQueryBo.java new file mode 100644 index 0000000..f1460d5 --- /dev/null +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/bo/HotVehicleThreeInspectVehicleQueryBo.java @@ -0,0 +1,26 @@ +package com.hotwj.platform.config.vehicleThreeInspect.domain.bo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 车辆三检车辆列表查询对象 + * + * @author shihongwei + * @date 2026-05-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class HotVehicleThreeInspectVehicleQueryBo extends BaseEntity { + + /** + * 企业ID + */ + private Long companyId; + + /** + * 车牌号 + */ + private String plateNumber; +} diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectReceivedVehicleVo.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectReceivedVehicleVo.java new file mode 100644 index 0000000..9ca2038 --- /dev/null +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectReceivedVehicleVo.java @@ -0,0 +1,29 @@ +package com.hotwj.platform.config.vehicleThreeInspect.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 车辆三检已收车车辆列表视图对象 + * + * @author shihongwei + * @date 2026-05-27 + */ +@Data +public class HotVehicleThreeInspectReceivedVehicleVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 车牌号 + */ + private String plateNumber; + + /** + * 车辆类型 + */ + private String vehicleType; +} diff --git a/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectUnreceivedVehicleVo.java b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectUnreceivedVehicleVo.java new file mode 100644 index 0000000..d9aac84 --- /dev/null +++ b/src/main/java/com/hotwj/platform/config/vehicleThreeInspect/domain/vo/HotVehicleThreeInspectUnreceivedVehicleVo.java @@ -0,0 +1,34 @@ +package com.hotwj.platform.config.vehicleThreeInspect.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 车辆三检未收车车辆列表视图对象 + * + * @author shihongwei + * @date 2026-05-27 + */ +@Data +public class HotVehicleThreeInspectUnreceivedVehicleVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 车牌号 + */ + private String plateNumber; + + /** + * 审核人 + */ + private String auditorName; + + /** + * 车辆类型 + */ + private String vehicleType; +} 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 fd241fc..752cccc 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,11 @@ 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.bo.HotVehicleThreeInspectVehicleQueryBo; 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.HotVehicleThreeInspectReceivedVehicleVo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectUnreceivedVehicleVo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; @@ -41,4 +44,20 @@ public interface HotVehicleThreeInspectMapper extends BaseMapperPlus queryUnreceivedVehicles(@Param("bo") HotVehicleThreeInspectVehicleQueryBo bo); + + /** + * 查询所有三检已收车的车辆列表 + * + * @param bo 查询条件 + * @return 已收车车辆列表 + */ + List queryReceivedVehicles(@Param("bo") HotVehicleThreeInspectVehicleQueryBo 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 d121335..af6ebe0 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,7 +2,10 @@ 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.bo.HotVehicleThreeInspectVehicleQueryBo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectProcessVo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectReceivedVehicleVo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectUnreceivedVehicleVo; 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; @@ -27,6 +30,22 @@ public interface IHotVehicleThreeInspectService { */ List queryAvailableVehicles(Long companyId); + /** + * 查询所有三检未收车的车辆列表 + * + * @param bo 查询条件 + * @return 未收车车辆列表 + */ + List queryUnreceivedVehicles(HotVehicleThreeInspectVehicleQueryBo bo); + + /** + * 查询所有三检已收车的车辆列表 + * + * @param bo 查询条件 + * @return 已收车车辆列表 + */ + List queryReceivedVehicles(HotVehicleThreeInspectVehicleQueryBo bo); + /** * 查询车辆三检 * 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 46ec949..aaf3e60 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,7 +8,10 @@ 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.bo.HotVehicleThreeInspectVehicleQueryBo; import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectProcessVo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectReceivedVehicleVo; +import com.hotwj.platform.config.vehicleThreeInspect.domain.vo.HotVehicleThreeInspectUnreceivedVehicleVo; 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; @@ -70,6 +73,16 @@ public class HotVehicleThreeInspectServiceImpl implements IHotVehicleThreeInspec return hotVehicleMapper.selectAvailableForThreeInspect(companyId); } + @Override + public List queryUnreceivedVehicles(HotVehicleThreeInspectVehicleQueryBo bo) { + return baseMapper.queryUnreceivedVehicles(bo); + } + + @Override + public List queryReceivedVehicles(HotVehicleThreeInspectVehicleQueryBo bo) { + return baseMapper.queryReceivedVehicles(bo); + } + @Override public boolean hasUnfinishedProcess(String vehicleId) { Long parsedVehicleId = parseVehicleId(vehicleId); diff --git a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml index 8e7b249..3e2ad7d 100644 --- a/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml +++ b/src/main/resources/mapper/securityManagement/HotVehicleThreeInspectMapper.xml @@ -175,4 +175,67 @@ ORDER BY MAX(create_time) DESC + + + +