From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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 6ba0be6..8f17d28 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,21 +3,17 @@
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.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);
-
/**
- * 瀵煎嚭Word璁惧缁存姢璁板綍
- *
- * @param deviceId
- * @param response
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @return
*/
- void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response);
+ IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance);
}
--
Gitblit v1.9.3