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-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index f665e13..6219c17 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -654,6 +654,11 @@
// 鐩戠潱鍐呭鍕鹃�夊睍绀轰覆(鐓х焊寮犺〃鎺掑竷)
recordDto.setSuperviseContentStr(buildSuperviseContentStr(recordDto.getSuperviseContent()));
+ // 鍙楃洃鐫ｄ汉澶氫釜鏃舵瘡琛屼竴涓�
+ if (StringUtils.isNotBlank(recordDto.getTestMember())) {
+ recordDto.setTestMember(recordDto.getTestMember().replace("銆�", "\n"));
+ }
+
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/daily-supervise-record.docx");
ConfigureBuilder builder = Configure.builder();
--
Gitblit v1.9.3