From 60afc1c228318d136a273cd0b389217f87583277 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 11 十月 2025 11:29:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetRepairRecordMapper.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetRepairRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetRepairRecordMapper.java index fe565f7..8bcddd2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetRepairRecordMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetRepairRecordMapper.java @@ -9,6 +9,7 @@ import com.ruoyi.system.query.AssetRepairRequestListQuery; import com.ruoyi.system.query.AssetStatisticsListQuery; import com.ruoyi.system.vo.AssetRepairRequestVO; +import com.ruoyi.system.vo.asset.AssetRepairRecordAssetVO; import com.ruoyi.system.vo.asset.AssetRepairRecordPageVO; import org.apache.ibatis.annotations.Param; @@ -34,5 +35,12 @@ */ IPage<AssetRepairRecordPageVO> getRepairRecordPageList(Page<AssetRepairRecordPageVO> page, @Param("query") AssetRepairRecordPageQuery pageQuery); + /** + * 查询维修记录关联的资产列表 + * @param repairRecordId 维修记录ID + * @return 维修资产列表 + */ + List<AssetRepairRecordAssetVO> getRepairAssetList(@Param("repairRecordId") Integer repairRecordId); + List<AssetRepairRequestVO> listAll(@Param("query")AssetRepairRequestListQuery query); } -- Gitblit v1.7.1