From c758c4e55d74a34902dac5752ff4f160118b19bc Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 23 九月 2025 14:09:36 +0800 Subject: [PATCH] 资产借用接口 --- ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationStorageService.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationStorageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationStorageService.java index 6ee3172..7472d53 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationStorageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationStorageService.java @@ -2,11 +2,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageGeneralDTO; import com.ruoyi.system.dto.asset.OaApprovalApplicationStoragePropertyDTO; import com.ruoyi.system.dto.asset.OaApprovalApplicationStorageVehicleDTO; import com.ruoyi.system.model.OaApprovalApplicationStorage; +import com.ruoyi.system.query.ApprovalDetailQuery; import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery; +import com.ruoyi.system.vo.StorageListVO; import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO; import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageGeneralDetailVO; import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePropertyDetailVO; @@ -52,19 +55,27 @@ /** * 获取通用资产入库申请详情 - * @param storageId 入库申请存储表ID + * @param approvalApplicationId 入库申请存储表ID */ - OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer storageId); + OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer approvalApplicationId); /** * 获取房产资产入库申请详情 - * @param storageId 入库申请存储表ID + * @param approvalApplicationId 入库申请存储表ID */ - OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer storageId); + OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer approvalApplicationId); /** * 获取车辆资产入库申请详情 - * @param storageId 入库申请存储表ID + * @param approvalApplicationId 入库申请存储表ID */ - OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer storageId); + OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer approvalApplicationId); + + PageInfo<StorageListVO> pageList(ApprovalDetailQuery query); + + /** + * 根据审批单ID删除入库申请 + * @param id + */ + void removeByApplicationId(Integer id); } -- Gitblit v1.7.1