报告模板调整

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(devType.getName()).concat(" ").concat(pqDevVO.getCreateId()).concat(".docx");
+                String reportFullPath = dirPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(".docx");
                 FileOutputStream out = new FileOutputStream(reportFullPath);
                 // 4. 保存新的Word文档
                 try {