Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 60afc1c228318d136a273cd0b389217f87583277

 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);
}