From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
index 4883178..8830d9f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java
@@ -3,22 +3,28 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+/**
+ * 璁惧缁存姢淇濆吇
+ */
public interface DeviceMaintenanceService extends IService<DeviceMaintenance> {
- IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber);
-
- List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId);
/**
- * 瀵煎嚭Word璁惧缁存姢璁板綍
- *
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @return
+ */
+ IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance);
+
+ /**
+ * 瀵煎嚭璁惧缁存姢淇濆吇
* @param deviceId
* @param response
+ * @return
*/
- void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response);
+ void exportDeviceMaintenance(Integer deviceId, HttpServletResponse response);
}
--
Gitblit v1.9.3