From 05e5ffa3d347218cfa12e8c4a58fae78d7146ff4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 16 十月 2026 14:57:30 +0800
Subject: [PATCH] 设备导出支持按筛选条件导出 - 仪器设备一览表导出: 支持设备名称/管理编号/状态/设备分类筛选, 无筛选时导出全部 - 设备使用记录导出: 支持样品编号/管理编号筛选; 未选中具体设备时可导出全部设备记录
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
index 75ac0af..d49ccbb 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
@@ -64,11 +64,11 @@
@Override
- public void exportUseRecord(Integer deviceId, String exportDate, HttpServletResponse response) {
- // 鏌ヨcnas璁惧浣跨敤璁板綍
- List<DeviceRecord> deviceList = baseMapper.selectExportList(deviceId, exportDate);
- // 璁惧淇℃伅
- Device device = deviceMapper.selectById(deviceId);
+ public void exportUseRecord(Integer deviceId, String sampleCode, String managementNumber, String exportDate, HttpServletResponse response) {
+ // 鏌ヨcnas璁惧浣跨敤璁板綍(鎸夊綋鍓嶇瓫閫夋潯浠�, 鏉′欢涓虹┖鏃跺鍑哄叏閮�)
+ List<DeviceRecord> deviceList = baseMapper.selectExportList(deviceId, sampleCode, managementNumber, exportDate);
+ // 璁惧淇℃伅(鏈�変腑鍏蜂綋璁惧鏃跺鍑哄叏閮ㄨ澶囩殑璁板綍, 璁惧淇℃伅鐣欑┖)
+ Device device = deviceId == null ? null : deviceMapper.selectById(deviceId);
// 鏌ヨ璁惧灞炰簬鍝釜瀹為獙瀹�
@@ -118,13 +118,13 @@
Configure configure = Configure.builder()
.bind("useRecord", new HackLoopTableRenderPolicy())
.build();
- String deviceName = device.getDeviceName();
- String managementNumber = device.getManagementNumber();
+ String deviceName = device == null ? "" : device.getDeviceName();
+ String deviceManagementNumber = device == null ? "" : device.getManagementNumber();
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
put("useRecord", deviceExportList);
put("deviceName", deviceName);
- put("managementNumber", managementNumber);
+ put("managementNumber", deviceManagementNumber);
put("laboratory", laboratoryName);
}});
--
Gitblit v1.9.3