From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
cnas-device/src/main/java/com/ruoyi/device/service/DeviceMaintenanceService.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..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,21 +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);
-
/**
- * 瀵煎嚭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