From ca6a10efa6bccd9ee2eba96403d6eef48b75f507 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 16 十月 2026 13:08:59 +0800
Subject: [PATCH] 质量监督：日常监督检查记录单导出受监督人多人每行一个，更新记录单模板；方法验证：删除时同步清理上岗证与校准证书子表
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 5 +++++
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java | 7 +++++++
cnas-process/src/main/resources/static/daily-supervise-record.docx | 0
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
index ca298cb..896488f 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
@@ -199,6 +199,13 @@
processMethodVerifyMethodFileService.remove(Wrappers.<ProcessMethodVerifyMethodFile>lambdaQuery()
.eq(ProcessMethodVerifyMethodFile::getMethodVerifyId, methodVerifyId));
+ // 鍒犻櫎鎵�鏈変笂宀楄瘉
+ processMethodVerifyWorkFileService.remove(Wrappers.<ProcessMethodVerifyWorkFile>lambdaQuery()
+ .eq(ProcessMethodVerifyWorkFile::getMethodVerifyId, methodVerifyId));
+
+ // 鍒犻櫎鎵�鏈夋牎鍑嗚瘉涔�
+ processMethodVerifyCalibrationsFileService.remove(Wrappers.<ProcessMethodVerifyCalibrationsFile>lambdaQuery()
+ .eq(ProcessMethodVerifyCalibrationsFile::getMethodVerifyId, methodVerifyId));
baseMapper.deleteById(methodVerifyId);
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();
diff --git a/cnas-process/src/main/resources/static/daily-supervise-record.docx b/cnas-process/src/main/resources/static/daily-supervise-record.docx
index d58c164..79b52e9 100644
--- a/cnas-process/src/main/resources/static/daily-supervise-record.docx
+++ b/cnas-process/src/main/resources/static/daily-supervise-record.docx
Binary files differ
--
Gitblit v1.9.3