diff --git a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/controller/HotVehicleController.java b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/controller/HotVehicleController.java index df18dd6..c3c92e0 100644 --- a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/controller/HotVehicleController.java +++ b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/controller/HotVehicleController.java @@ -28,6 +28,7 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -83,6 +84,17 @@ public class HotVehicleController extends BaseController { public TableDataInfo listByStatus(HotVehicleStatusBo bo, PageQuery pageQuery) { return hotVehicleService.queryPageListByStatus(bo, pageQuery); } + + /** + * 查询当前企业可绑定的车辆列表 + */ + @GetMapping("/bindableList") + @Operation(summary = "查询当前企业可绑定的车辆列表") + public R> bindableList(HotVehicleBo bo) { + bo.setCompanyId(LoginHelper.getLoginUser().getCompanyId()); + return R.ok(hotVehicleService.queryBindableList(bo)); + } + /** * 导入车辆 */ diff --git a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/IHotVehicleService.java b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/IHotVehicleService.java index 04a9458..bca1e8c 100644 --- a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/IHotVehicleService.java +++ b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/IHotVehicleService.java @@ -62,6 +62,14 @@ public interface IHotVehicleService { */ TableDataInfo queryPageListByStatus(HotVehicleStatusBo bo, PageQuery pageQuery); + /** + * 查询当前企业可绑定的车辆列表 + * + * @param bo 查询条件 + * @return 可绑定车辆列表 + */ + List queryBindableList(HotVehicleBo bo); + /** * 查询符合条件的公司车辆信息列表 * diff --git a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java index bb69a1c..2256285 100644 --- a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java +++ b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java @@ -197,6 +197,30 @@ public class HotVehicleServiceImpl implements IHotVehicleService { return TableDataInfo.build(result); } + /** + * 查询当前企业可绑定的车辆列表 + * + * @param bo 查询条件 + * @return 可绑定车辆列表 + */ + @Override + public List queryBindableList(HotVehicleBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(HotVehicle::getArchiveNo) + .orderByAsc(HotVehicle::getPlateNumber) + .eq(bo.getCompanyId() != null, HotVehicle::getCompanyId, bo.getCompanyId()) + .eq(HotVehicle::getVehicleStatus, 1L) + .eq(HotVehicle::getOperationStatus, 1L) + .eq(HotVehicle::getIsDeleted, 0L) + .and(wrapper -> wrapper.isNull(HotVehicle::getCurrentDriver) + .or() + .eq(HotVehicle::getCurrentDriver, "")) + .like(StringUtils.isNotBlank(bo.getPlateNumber()), HotVehicle::getPlateNumber, bo.getPlateNumber()) + .eq(StringUtils.isNotBlank(bo.getVehicleType()), HotVehicle::getVehicleType, bo.getVehicleType()) + .eq(StringUtils.isNotBlank(bo.getVehicleCategory()), HotVehicle::getVehicleCategory, bo.getVehicleCategory()); + return baseMapper.selectVoList(lqw); + } + /** * 查询符合条件的公司车辆信息列表 *