diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicalrewritingController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicalrewritingController.java
index fb991537..a366b605 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicalrewritingController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicalrewritingController.java
@@ -2,10 +2,14 @@ package org.dromara.mechanical.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.mechanical.domain.bo.BusMechanicaltypeBo;
+import org.dromara.mechanical.domain.vo.BusMechanicaltypeVo;
+import org.dromara.mechanical.service.IBusMechanicaltypeService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -36,6 +40,15 @@ public class BusMechanicalrewritingController extends BaseController {
 
     private final IBusMechanicalrewritingService busMechanicalrewritingService;
 
+    private final IBusMechanicaltypeService busMechanicaltypeService;
+
+
+    @SaCheckPermission(value = {"mechanical:mechanicalrewriting:list","mechanical:mechanicalrewriting:add","mechanical:mechanicalrewriting:edit"},mode = SaMode.OR)
+    @GetMapping("/getTree")
+    public R<List<BusMechanicaltypeVo>> getTree(BusMechanicaltypeBo bo) {
+        return R.ok(busMechanicaltypeService.getTree(bo));
+    }
+
     /**
      * 查询机械台账列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBiddingPlanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBiddingPlanController.java
index e478feea..9c4d3b0e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBiddingPlanController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBiddingPlanController.java
@@ -2,6 +2,7 @@ package org.dromara.tender.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -9,10 +10,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.formalities.domain.bo.BusFormalitiesAnnexBo;
 import org.dromara.formalities.domain.bo.BusFormalitiesAreConsolidatedBo;
-import org.dromara.tender.domain.bo.BusSegmentedIndicatorPlanningBo;
-import org.dromara.tender.domain.vo.BusBiddingPlanAnnexVo;
-import org.dromara.tender.domain.vo.BusBiddingPlanDetailVo;
-import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
+import org.dromara.tender.domain.bo.*;
+import org.dromara.tender.domain.vo.*;
+import org.dromara.tender.service.IBusBiddingPlanAnnexService;
+import org.dromara.tender.service.IBusBillofquantitiesLimitListService;
+import org.dromara.tender.service.ITenderSupplierInputService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -24,8 +27,6 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.tender.domain.vo.BusBiddingPlanVo;
-import org.dromara.tender.domain.bo.BusBiddingPlanBo;
 import org.dromara.tender.service.IBusBiddingPlanService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -43,6 +44,61 @@ import org.springframework.web.multipart.MultipartFile;
 public class BusBiddingPlanController extends BaseController {
 
     private final IBusBiddingPlanService busBiddingPlanService;
+    @Lazy
+    private final IBusBillofquantitiesLimitListService busBillofquantitiesLimitListService;
+    @Lazy
+    private final IBusBiddingPlanAnnexService busBiddingPlanAnnexService;
+    @Lazy
+    private final ITenderSupplierInputService tenderSupplierInputService;
+
+    /**
+     * 查询供应商入库列表
+     */
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
+    @GetMapping("/getSupplierInputList")
+    public R<List<TenderSupplierInputVo>> list(TenderSupplierInputBo bo) {
+        return R.ok(tenderSupplierInputService.getList(bo));
+    }
+
+    /**
+     * 删除招标计划-招标文件
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("tender:biddingPlan:edit")
+    @Log(title = "招标计划-招标文件", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delectPlanAnnex/{ids}")
+    public R<Void> delectPlanAnnex(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(busBiddingPlanAnnexService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 获取所有版本号
+     */
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
+    @GetMapping("/obtainAllVersionNumbers")
+    public R<List<BusBLimitListVersionsVo>> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) {
+        return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo));
+    }
+
+    /**
+     * 获取指定版本的sheet
+     */
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
+    @GetMapping("/sheetList")
+    public R<List<String>> sheetList(BusBillofquantitiesLimitListBo bo) {
+        return R.ok(busBillofquantitiesLimitListService.sheetList(bo));
+    }
+
+    /**
+     * 查询限价一览列表
+     */
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
+    @GetMapping("/getTree")
+    public R<List<BusBillofquantitiesLimitListVo>> getTree(BusBillofquantitiesLimitListBo bo) {
+        return R.ok(busBillofquantitiesLimitListService.getTree(bo));
+    }
 
     /**
      * 查询招标计划列表
@@ -61,7 +117,7 @@ public class BusBiddingPlanController extends BaseController {
      * @param bo
      * @return
      */
-    @SaCheckPermission("tender:biddingPlan:getMore")
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
     @GetMapping("/getMore")
     public R<List<BusBillofquantitiesLimitListVo>> getMore(BusBiddingPlanBo bo) {
         if (bo.getId() == null) {
@@ -75,7 +131,7 @@ public class BusBiddingPlanController extends BaseController {
      * @param bo
      * @return
      */
-    @SaCheckPermission("tender:biddingPlan:getAnnex")
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
     @GetMapping("/getAnnex")
     public R<List<BusBiddingPlanAnnexVo>> getAnnex(BusBiddingPlanBo bo) {
         if (bo.getId() == null) {
@@ -122,7 +178,7 @@ public class BusBiddingPlanController extends BaseController {
     /**
      * 上传招标文件
      */
-    @SaCheckPermission("tender:biddingPlan:uploadBiddingDocuments")
+    @SaCheckPermission(value = {"tender:biddingPlan:list","tender:biddingPlan:add","tender:biddingPlan:edit"},mode = SaMode.OR)
     @Log(title = "招标计划", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PutMapping("/uploadBiddingDocuments")
@@ -145,7 +201,7 @@ public class BusBiddingPlanController extends BaseController {
     /**
      * 修改合规性手续合账
      */
-    @SaCheckPermission("tender:biddingPlan:editStatus")
+    @SaCheckPermission("tender:biddingPlan:edit")
     @Log(title = "招标计划", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/editStatus")
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java
index 2905993d..94b13b94 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusSegmentedIndicatorPlanningController.java
@@ -2,16 +2,23 @@ package org.dromara.tender.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.exception.ServiceException;
+import org.dromara.tender.domain.bo.BusBillofquantitiesLimitListBo;
+import org.dromara.tender.domain.bo.TenderAllVersionNumbersReq;
+import org.dromara.tender.domain.vo.BusBLimitListVersionsVo;
 import org.dromara.tender.domain.vo.BusBillofquantitiesLimitListVo;
 import org.dromara.tender.domain.TenderPlanFile;
+import org.dromara.tender.enums.LimitListTypeEnum;
+import org.dromara.tender.service.IBusBillofquantitiesLimitListService;
 import org.dromara.tender.service.impl.TenderPlanFileServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -44,6 +51,38 @@ public class BusSegmentedIndicatorPlanningController extends BaseController {
 
     private final TenderPlanFileServiceImpl tenderPlanFileService;
 
+    @Lazy
+    private final IBusBillofquantitiesLimitListService busBillofquantitiesLimitListService;
+
+    /**
+     * 获取所有版本号
+     */
+    @SaCheckPermission(value = {"tender:segmentedIndicatorPlanning:list","tender:segmentedIndicatorPlanning:add","tender:segmentedIndicatorPlanning:edit"},mode = SaMode.OR)
+    @GetMapping("/obtainAllVersionNumbers")
+    public R<List<BusBLimitListVersionsVo>> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) {
+        return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo));
+    }
+
+    /**
+     * 获取指定版本的sheet
+     */
+    @SaCheckPermission(value = {"tender:segmentedIndicatorPlanning:list","tender:segmentedIndicatorPlanning:add","tender:segmentedIndicatorPlanning:edit"},mode = SaMode.OR)
+    @GetMapping("/sheetList")
+    public R<List<String>> sheetList(BusBillofquantitiesLimitListBo bo) {
+//        bo.setType(LimitListTypeEnum.COMPANY.getCode());
+        return R.ok(busBillofquantitiesLimitListService.sheetList(bo));
+    }
+
+    /**
+     * 查询限价一览列表
+     */
+    @SaCheckPermission(value = {"tender:segmentedIndicatorPlanning:list","tender:segmentedIndicatorPlanning:add","tender:segmentedIndicatorPlanning:edit"},mode = SaMode.OR)
+    @GetMapping("/getTree")
+    public R<List<BusBillofquantitiesLimitListVo>> getTree(BusBillofquantitiesLimitListBo bo) {
+        bo.setType(LimitListTypeEnum.COMPANY.getCode());
+        return R.ok(busBillofquantitiesLimitListService.getTree(bo));
+    }
+
     /**
      * 查询分标策划列表
      */
@@ -64,7 +103,7 @@ public class BusSegmentedIndicatorPlanningController extends BaseController {
      * @param bo
      * @return
      */
-    @SaCheckPermission("tender:segmentedIndicatorPlanning:getMore")
+    @SaCheckPermission(value = {"tender:segmentedIndicatorPlanning:list","tender:segmentedIndicatorPlanning:add","tender:segmentedIndicatorPlanning:edit"},mode = SaMode.OR)
     @GetMapping("/getMore")
     public R<List<BusBillofquantitiesLimitListVo>> getMore(BusSegmentedIndicatorPlanningBo bo) {
         if (bo.getId() == null) {
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java
index 2f65f7d8..f6300ede 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusTenderPlanLimitListController.java
@@ -1,6 +1,7 @@
 package org.dromara.tender.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -61,7 +62,7 @@ public class BusTenderPlanLimitListController extends BaseController {
     /**
      * 获取所有版本号
      */
-    @SaCheckPermission("tender:tenderPlanLimitList:obtainAllVersionNumbers")
+    @SaCheckPermission(value = {"tender:tenderPlanLimitList:list","tender:tenderPlanLimitList:add","tender:tenderPlanLimitList:edit"},mode = SaMode.OR)
     @GetMapping("/obtainAllVersionNumbers")
     public R<List<BusBLimitListVersionsVo>> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) {
         return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo));
@@ -70,7 +71,7 @@ public class BusTenderPlanLimitListController extends BaseController {
     /**
      * 获取所有版本详细信息
      */
-    @SaCheckPermission("tender:tenderPlanLimitList:getVersionDetail")
+    @SaCheckPermission(value = {"tender:tenderPlanLimitList:list","tender:tenderPlanLimitList:add","tender:tenderPlanLimitList:edit"},mode = SaMode.OR)
     @GetMapping("/getVersionDetail/{id}")
     public R<BusBLimitListVersionsVo> getVersionDetail(@NotNull(message = "id不能为空") @PathVariable Long id) {
         return R.ok(busBillofquantitiesLimitListService.getVersionDetail(id));
@@ -79,7 +80,7 @@ public class BusTenderPlanLimitListController extends BaseController {
     /**
      * 获取指定版本的sheet
      */
-    @SaCheckPermission("tender:tenderPlanLimitList:sheetList")
+    @SaCheckPermission(value = {"tender:tenderPlanLimitList:list","tender:tenderPlanLimitList:add","tender:tenderPlanLimitList:edit"},mode = SaMode.OR)
     @GetMapping("/sheetList")
     public R<List<String>> sheetList(BusBillofquantitiesLimitListBo bo) {
         return R.ok(busBillofquantitiesLimitListService.sheetList(bo));
@@ -113,7 +114,7 @@ public class BusTenderPlanLimitListController extends BaseController {
     /**
      * 导入excel
      */
-    @SaCheckPermission("tender:tenderPlanLimitList:importExcelFile")
+    @SaCheckPermission("tender:tenderPlanLimitList:edit")
     @Log(title = "导入excel", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/importExcelFile")
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java
index 281c24f1..e0d50bae 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java
@@ -1,6 +1,7 @@
 package org.dromara.vehicle.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,9 +14,16 @@ 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.web.core.BaseController;
+import org.dromara.vehicle.domain.bo.VehVehicleInfoBo;
 import org.dromara.vehicle.domain.dto.vehicleapply.*;
+import org.dromara.vehicle.domain.dto.vehicletrip.VehVehicleTripCreateReq;
+import org.dromara.vehicle.domain.dto.vehicletrip.VehVehicleTripQueryReq;
 import org.dromara.vehicle.domain.vo.VehVehicleApplyVo;
+import org.dromara.vehicle.domain.vo.VehVehicleInfoVo;
+import org.dromara.vehicle.domain.vo.VehVehicleTripVo;
 import org.dromara.vehicle.service.IVehVehicleApplyService;
+import org.dromara.vehicle.service.IVehVehicleInfoService;
+import org.dromara.vehicle.service.IVehVehicleTripService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +43,38 @@ public class VehVehicleApplyController extends BaseController {
 
     private final IVehVehicleApplyService vehVehicleApplyService;
 
+    private final IVehVehicleInfoService vehVehicleInfoService;
+    private final IVehVehicleTripService vehVehicleTripService;
+
+    /**
+     * 查询车辆信息列表
+     */
+    @SaCheckPermission(value = {"vehicle:vehicleApply:list","vehicle:vehicleApply:add","vehicle:vehicleApply:edit"},mode = SaMode.OR)
+    @GetMapping("/getInfoList")
+    public TableDataInfo<VehVehicleInfoVo> getInfoList(VehVehicleInfoBo bo, PageQuery pageQuery) {
+        return vehVehicleInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 新增车辆出行记录
+     */
+    @SaCheckPermission(value = {"vehicle:vehicleApply:list","vehicle:vehicleApply:add","vehicle:vehicleApply:edit"},mode = SaMode.OR)
+    @Log(title = "车辆出行记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/tripAdd")
+    public R<Long> tripAdd(@Validated @RequestBody VehVehicleTripCreateReq req) {
+        return R.ok(vehVehicleTripService.insertByBo(req));
+    }
+
+    /**
+     * 查询车辆出行记录列表
+     */
+    @SaCheckPermission(value = {"vehicle:vehicleApply:list","vehicle:vehicleApply:add","vehicle:vehicleApply:edit"},mode = SaMode.OR)
+    @GetMapping("/getTripList")
+    public TableDataInfo<VehVehicleTripVo> getTripList(VehVehicleTripQueryReq req, PageQuery pageQuery) {
+        return vehVehicleTripService.queryPageList(req, pageQuery);
+    }
+
     /**
      * 查询乘车申请列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java
index f03d82d5..4656550b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java
@@ -1,6 +1,7 @@
 package org.dromara.vehicle.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -15,6 +16,12 @@ 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.web.core.BaseController;
+import org.dromara.gps.domain.bo.GpsEquipmentBo;
+import org.dromara.gps.domain.bo.GpsEquipmentSonBo;
+import org.dromara.gps.domain.vo.GpsEquipmentSonVo;
+import org.dromara.gps.domain.vo.GpsEquipmentVo;
+import org.dromara.gps.service.IGpsEquipmentService;
+import org.dromara.gps.service.IGpsEquipmentSonService;
 import org.dromara.vehicle.domain.bo.VehVehicleInfoBo;
 import org.dromara.vehicle.domain.vo.VehVehicleInfoVo;
 import org.dromara.vehicle.domain.vo.VehVehicleTripVo;
@@ -38,6 +45,30 @@ public class VehVehicleInfoController extends BaseController {
 
     private final IVehVehicleInfoService vehVehicleInfoService;
 
+    private final IGpsEquipmentService gpsEquipmentService;
+
+    private final IGpsEquipmentSonService gpsEquipmentSonService;
+
+    /**
+     * 查询GPS设备详细列表给车辆
+     * @param bo
+     * @return
+     */
+    @SaCheckPermission(value = {"vehicle:vehicleInfo:add","vehicle:vehicleInfo:edit"},mode = SaMode.OR)
+    @GetMapping("/getListToVehicle")
+    public R<List<GpsEquipmentVo>> getListToVehicle(GpsEquipmentBo bo) {
+        return R.ok(gpsEquipmentService.getListToVehicle(bo));
+    }
+
+    /**
+     * 车辆获取gps设备轨迹列表数据
+     */
+    @SaCheckPermission(value = {"vehicle:vehicleInfo:list","vehicle:vehicleInfo:add","vehicle:vehicleInfo:edit"},mode = SaMode.OR)
+    @GetMapping("/getVehicleList")
+    public R<List<GpsEquipmentSonVo>> getVehicleList(GpsEquipmentSonBo bo) {
+        return R.ok(gpsEquipmentSonService.getVehicleList(bo));
+    }
+
     /**
      * 查询车辆信息列表
      */
@@ -104,7 +135,7 @@ public class VehVehicleInfoController extends BaseController {
     /**
      * 车辆绑定gps设备
      */
-//    @SaCheckPermission("vehicle:vehicleInfo:bindClient")
+    @SaCheckPermission("vehicle:vehicleInfo:edit")
     @PostMapping("/bindClient")
     public R<Void> bindClient(@RequestBody VehVehicleInfoBo bo) {
         return toAjax(vehVehicleInfoService.bindClient(bo));
@@ -112,7 +143,7 @@ public class VehVehicleInfoController extends BaseController {
     /**
      * 车辆解绑gps设备
      */
-//    @SaCheckPermission("vehicle:vehicleInfo:bindClient")
+    @SaCheckPermission("vehicle:vehicleInfo:edit")
     @PostMapping("/unBindClient")
     public R<Void> unBindClient(@RequestBody VehVehicleInfoBo bo) {
         return toAjax(vehVehicleInfoService.unBindClient(bo));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java
new file mode 100644
index 00000000..fb8d3488
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java
@@ -0,0 +1,90 @@
+package org.dromara.vehicle.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+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.web.core.BaseController;
+import org.dromara.vehicle.domain.dto.vehicletrip.VehVehicleTripCreateReq;
+import org.dromara.vehicle.domain.dto.vehicletrip.VehVehicleTripQueryReq;
+import org.dromara.vehicle.domain.dto.vehicletrip.VehVehicleTripUpdateReq;
+import org.dromara.vehicle.domain.vo.VehVehicleTripVo;
+import org.dromara.vehicle.service.IVehVehicleTripService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用车审核
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/vehicle/vehicleInspection")
+public class VehVehicleInspectionController extends BaseController {
+
+    private final IVehVehicleTripService vehVehicleTripService;
+
+    /**
+     * 查询车辆出行记录列表
+     */
+    @SaCheckPermission("vehicle:vehicleInspection:list")
+    @GetMapping("/list")
+    public TableDataInfo<VehVehicleTripVo> list(VehVehicleTripQueryReq req, PageQuery pageQuery) {
+        return vehVehicleTripService.queryPageList(req, pageQuery);
+    }
+
+    /**
+     * 获取车辆出行记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("vehicle:vehicleInspection:query")
+    @GetMapping("/{id}")
+    public R<VehVehicleTripVo> getInfo(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(vehVehicleTripService.queryById(id));
+    }
+
+    /**
+     * 新增车辆出行记录
+     */
+    @SaCheckPermission("vehicle:vehicleInspection:add")
+    @Log(title = "车辆出行记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Long> add(@Validated @RequestBody VehVehicleTripCreateReq req) {
+        return R.ok(vehVehicleTripService.insertByBo(req));
+    }
+
+    /**
+     * 修改车辆出行记录
+     */
+    @SaCheckPermission("vehicle:vehicleInspection:edit")
+    @Log(title = "车辆出行记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated @RequestBody VehVehicleTripUpdateReq req) {
+        return toAjax(vehVehicleTripService.updateByBo(req));
+    }
+
+    /**
+     * 删除车辆出行记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("vehicle:vehicleInspection:remove")
+    @Log(title = "车辆出行记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(vehVehicleTripService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java
index 83eb720b..ee2a0d07 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java
@@ -13,9 +13,16 @@ 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.web.core.BaseController;
+import org.dromara.vehicle.domain.bo.VehVehicleInfoBo;
+import org.dromara.vehicle.domain.dto.vehicleapply.VehVehicleApplyCancelReq;
+import org.dromara.vehicle.domain.dto.vehicleapply.VehVehicleApplyChangeStatusReq;
+import org.dromara.vehicle.domain.dto.vehicleapply.VehVehicleApplyReviewReq;
 import org.dromara.vehicle.domain.dto.vehicletrip.*;
+import org.dromara.vehicle.domain.vo.VehVehicleInfoVo;
 import org.dromara.vehicle.domain.vo.VehVehicleTripMyVo;
 import org.dromara.vehicle.domain.vo.VehVehicleTripVo;
+import org.dromara.vehicle.service.IVehVehicleApplyService;
+import org.dromara.vehicle.service.IVehVehicleInfoService;
 import org.dromara.vehicle.service.IVehVehicleTripService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +43,31 @@ public class VehVehicleTripController extends BaseController {
 
     private final IVehVehicleTripService vehVehicleTripService;
 
+    private final IVehVehicleApplyService vehVehicleApplyService;
+
+    /**
+     * 车主审核
+     */
+    @SaCheckPermission("vehicle:vehicleTrip:edit")
+    @Log(title = "乘车申请", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/driverReview")
+    public R<Void> driverReview(@Validated @RequestBody VehVehicleApplyReviewReq req) {
+        return toAjax(vehVehicleApplyService.driverReview(req));
+    }
+
+    /**
+     * 乘客取消申请
+     */
+    @SaCheckPermission("vehicle:vehicleTrip:edit")
+    @Log(title = "乘车申请", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/applyCancel")
+    public R<Void> cancel(@Validated @RequestBody VehVehicleApplyCancelReq req) {
+        return toAjax(vehVehicleApplyService.cancelApply(req));
+    }
+
+
     /**
      * 查询车辆出行记录列表
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java
index 0a809332..76b10318 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiFkController.java
@@ -39,7 +39,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/paymentsReceipts/sfkShejiFk")
+@RequestMapping("/xzd/paymentsReceipts/sfkShejiFk")
 public class XzdSfkShejiFkController extends BaseController {
 
     private final IXzdSfkShejiFkService xzdSfkShejiFkService;
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java
index 79362c97..2f272f5e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/paymentsReceipts/controller/XzdSfkShejiSkController.java
@@ -39,7 +39,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/paymentsReceipts/sfkShejiSk")
+@RequestMapping("/xzd/paymentsReceipts/sfkShejiSk")
 public class XzdSfkShejiSkController extends BaseController {
 
     private final IXzdSfkShejiSkService xzdSfkShejiSkService;