From b84fc1807a6ce71f4d10cdb10da186abc5dcc173 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 19:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationStorageService.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 3c8ead4..2df657c 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
@@ -1,10 +1,19 @@
package com.ruoyi.system.service;
+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;
+import com.ruoyi.system.vo.asset.OaApprovalApplicationStorageVehicleDetailVO;
/**
* <p>
@@ -36,4 +45,31 @@
* @param dto 车辆资产入库申请DTO
*/
void submitVehicleAssetStorage(OaApprovalApplicationStorageVehicleDTO dto);
+
+ /**
+ * 获取资产入库申请分页列表
+ * @param pageQuery 查询条件
+ * @return 分页数据
+ */
+ IPage<OaApprovalApplicationStoragePageVO> getPageList(OaApprovalApplicationStoragePageQuery pageQuery);
+
+ /**
+ * 获取通用资产入库申请详情
+ * @param storageId 入库申请存储表ID
+ */
+ OaApprovalApplicationStorageGeneralDetailVO getGeneralDetail(Integer storageId);
+
+ /**
+ * 获取房产资产入库申请详情
+ * @param storageId 入库申请存储表ID
+ */
+ OaApprovalApplicationStoragePropertyDetailVO getPropertyDetail(Integer storageId);
+
+ /**
+ * 获取车辆资产入库申请详情
+ * @param storageId 入库申请存储表ID
+ */
+ OaApprovalApplicationStorageVehicleDetailVO getVehicleDetail(Integer storageId);
+
+ PageInfo<StorageListVO> pageList(ApprovalDetailQuery query);
}
--
Gitblit v1.7.1