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/mapper/DeviceRecordMapper.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java
index cce6942..f56de36 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java
@@ -19,7 +19,12 @@
*/
public interface DeviceRecordMapper extends BaseMapper<DeviceRecord> {
- IPage<DeviceRecordDto> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber, @Param("userId") Integer userId);
+ IPage<DeviceRecordDto> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page,
+ @Param("deviceName") String deviceName,
+ @Param("specificationModel") String specificationModel,
+ @Param("sampleCode") String sampleCode,
+ @Param("managementNumber") String managementNumber,
+ @Param("userId") Integer userId);
/**
@@ -31,10 +36,15 @@
/**
* 鏌ヨ瀵煎嚭璁惧浣跨敤璁板綍
* @param deviceId
+ * @param deviceName 璁惧鍚嶇О绛涢��
+ * @param specificationModel 璁惧鍨嬪彿绛涢��
+ * @param managementNumber 璁惧缂栧彿绛涢��
* @param sampleCode 鏍峰搧缂栧彿绛涢��
- * @param managementNumber 绠＄悊缂栧彿绛涢��
- * @param exportDate
* @return
*/
- List<DeviceRecord> selectExportList(@Param("deviceId") Integer deviceId, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber, @Param("exportDate") String exportDate);
+ List<DeviceRecordDto> selectExportList(@Param("deviceId") Integer deviceId,
+ @Param("deviceName") String deviceName,
+ @Param("specificationModel") String specificationModel,
+ @Param("managementNumber") String managementNumber,
+ @Param("sampleCode") String sampleCode);
}
--
Gitblit v1.9.3