From 8ad863082097ffdcab4a8e7f426d344a1fe6f892 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 07 十一月 2026 00:27:02 +0800
Subject: [PATCH] 修复人员管理接口校验与导出，完善设备保养计划与文件受控功能
---
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceRecordController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceRecordController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceRecordController.java
index 4a844be..2fe8b6b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceRecordController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceRecordController.java
@@ -29,8 +29,10 @@
@Operation(summary = "澶囦娇鐢ㄨ褰曟煡璇�")
@GetMapping("/deviceRecordPage")
- public Result deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber) {
- return Result.success(deviceRecordService.deviceRecordPage(deviceId, page, sampleCode, managementNumber));
+ public Result deviceRecordPage(Integer deviceId, Page page, String deviceName,
+ String specificationModel, String sampleCode, String managementNumber) {
+ return Result.success(deviceRecordService.deviceRecordPage(
+ deviceId, page, deviceName, specificationModel, sampleCode, managementNumber));
}
@Operation(summary = "鏂板")
@@ -57,7 +59,9 @@
@Operation(summary = "璁惧浣跨敤璁板綍瀵煎嚭")
@GetMapping("/exportUseRecord")
- public void exportUseRecord(Integer deviceId, String sampleCode, String managementNumber, String exportDate, HttpServletResponse response){
- deviceRecordService.exportUseRecord(deviceId, sampleCode, managementNumber, exportDate, response);
+ public void exportUseRecord(Integer deviceId, String deviceName, String specificationModel,
+ String managementNumber, String sampleCode, HttpServletResponse response) {
+ deviceRecordService.exportUseRecord(
+ deviceId, deviceName, specificationModel, managementNumber, sampleCode, response);
}
}
--
Gitblit v1.9.3