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/service/AssetRepairRecordService.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetRepairRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetRepairRecordService.java
index 240be6c..0b24b6f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetRepairRecordService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/AssetRepairRecordService.java
@@ -1,12 +1,18 @@
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.AssetRepairRecordAddDTO;
+import com.ruoyi.system.dto.asset.AssetRepairCompleteDTO;
import com.ruoyi.system.model.AssetRepairRecord;
+import com.ruoyi.system.query.AssetRepairRecordPageQuery;
import com.ruoyi.system.query.AssetRepairRequestListQuery;
-import com.ruoyi.system.query.AssetStatisticsListQuery;
import com.ruoyi.system.vo.AssetRepairRequestVO;
-import com.ruoyi.system.vo.AssetStatisticsVO;
+import com.ruoyi.system.vo.asset.AssetRepairRecordDetailVO;
+import com.ruoyi.system.vo.asset.AssetRepairRecordPageVO;
+
+import java.util.List;
/**
* <p>
@@ -20,4 +26,38 @@
PageInfo<AssetRepairRequestVO> pageList(AssetRepairRequestListQuery query);
+ /**
+ * 获取维修记录分页列表
+ * @param pageQuery 查询参数
+ * @return 分页结果
+ */
+ IPage<AssetRepairRecordPageVO> getRepairRecordPageList(AssetRepairRecordPageQuery pageQuery);
+
+ /**
+ * 新增维修记录
+ *
+ * @param addDTO 新增维修记录DTO
+ */
+ void addRepairRecord(AssetRepairRecordAddDTO addDTO);
+
+ /**
+ * 获取维修记录详情
+ *
+ * @param id
+ * @return 维修记录详情
+ */
+ AssetRepairRecordDetailVO getRepairRecordDetail(Integer id);
+
+ /**
+ * 完成维修
+ * @param dto
+ */
+ void completeRepair(AssetRepairCompleteDTO dto);
+
+ /**
+ * 删除
+ * @param id
+ */
+ void deleteById(Integer id);
+ List<AssetRepairRequestVO> listAll(AssetRepairRequestListQuery query);
}
--
Gitblit v1.7.1