From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 09 十月 2025 11:56:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetItemService.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetItemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetItemService.java index 7a2fde6..9bca775 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetItemService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetItemService.java @@ -1,7 +1,12 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.OaApprovalApplicationAssetItem; +import com.ruoyi.system.query.ApprovalDetailQuery; +import com.ruoyi.system.vo.GrabListVO; + +import java.util.List; /** * <p> @@ -13,4 +18,11 @@ */ public interface OaApprovalApplicationAssetItemService extends IService<OaApprovalApplicationAssetItem> { + PageInfo<GrabListVO> pageList(ApprovalDetailQuery query); + + /** + * 校验资产状态,检查是否存在待审批的记录 + * @param assetMainIds 资产ID列表 + */ + void validateAssetStatus(List<Integer> assetMainIds); } -- Gitblit v1.7.1