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 390155ee..28bf0985 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 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 { diff --git a/entrance/src/main/resources/model/NPQS680.docx b/entrance/src/main/resources/model/NPQS680.docx index aec02c9a..86ff7a79 100644 Binary files a/entrance/src/main/resources/model/NPQS680.docx and b/entrance/src/main/resources/model/NPQS680.docx differ diff --git a/entrance/src/main/resources/model/njcn_882.docx b/entrance/src/main/resources/model/njcn_882.docx index 2e8db528..fca74f3e 100644 Binary files a/entrance/src/main/resources/model/njcn_882.docx and b/entrance/src/main/resources/model/njcn_882.docx differ diff --git a/entrance/src/main/resources/model/njcn_882A.docx b/entrance/src/main/resources/model/njcn_882A.docx index 853b3766..6057cb97 100644 Binary files a/entrance/src/main/resources/model/njcn_882A.docx and b/entrance/src/main/resources/model/njcn_882A.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B1.docx b/entrance/src/main/resources/model/njcn_882B1.docx index 31bb97c3..538f0bdb 100644 Binary files a/entrance/src/main/resources/model/njcn_882B1.docx and b/entrance/src/main/resources/model/njcn_882B1.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B2.docx b/entrance/src/main/resources/model/njcn_882B2.docx index 5c038ae4..50bef8a4 100644 Binary files a/entrance/src/main/resources/model/njcn_882B2.docx and b/entrance/src/main/resources/model/njcn_882B2.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B3.docx b/entrance/src/main/resources/model/njcn_882B3.docx index d5500263..cfe6484d 100644 Binary files a/entrance/src/main/resources/model/njcn_882B3.docx and b/entrance/src/main/resources/model/njcn_882B3.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B4.docx b/entrance/src/main/resources/model/njcn_882B4.docx index 95cd22f0..0b42cf60 100644 Binary files a/entrance/src/main/resources/model/njcn_882B4.docx and b/entrance/src/main/resources/model/njcn_882B4.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B5.docx b/entrance/src/main/resources/model/njcn_882B5.docx index 21c5829a..41fea173 100644 Binary files a/entrance/src/main/resources/model/njcn_882B5.docx and b/entrance/src/main/resources/model/njcn_882B5.docx differ diff --git a/entrance/src/main/resources/model/njcn_882B6.docx b/entrance/src/main/resources/model/njcn_882B6.docx index 30a92bfa..c4699b30 100644 Binary files a/entrance/src/main/resources/model/njcn_882B6.docx and b/entrance/src/main/resources/model/njcn_882B6.docx differ