From f922ee97aa2a21fd4c4af72cd31b4924547ab441 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 30 Oct 2025 09:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=B7=AF=E5=BE=84=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/report/service/impl/PqReportServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
index 28bf0985..390155ee 100644
--- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
@@ -602,11 +602,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 dealDataModel(baseModelDocument, devReportParam, pqDevVO);
                 // 处理需要输出的目录地址 基础路径+设备类型+装置编号.docx
                 // 最终文件输出的路径
-                String dirPath = reportPath.concat(File.separator).concat(devType.getName());
-//                String dirPath = reportPath;
+//                String dirPath = reportPath.concat(File.separator).concat(devType.getName());
+                String dirPath = reportPath;
                 // 确保目录存在
                 ensureDirectoryExists(dirPath);
-                String reportFullPath = dirPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(".docx");
+                String reportFullPath = dirPath.concat(File.separator).concat(devType.getName()).concat(" ").concat(pqDevVO.getCreateId()).concat(".docx");
                 FileOutputStream out = new FileOutputStream(reportFullPath);
                 // 4. 保存新的Word文档
                 try {