Jelajahi Sumber

核心检验指标Word导出

DLC 5 bulan lalu
induk
melakukan
c7e8a85b95

+ 2 - 5
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -808,8 +808,8 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
         if (Objects.nonNull(fileIdObj)) {
             fileId = (String) fileIdObj;
         } else {
-//            fileId = "7a3213f88d7146e88f1508b61dcb3202";//1057加拿大模板
-            fileId = "45f4b5330f8e47298a4b297b4fabe539";//1075沙特模板
+            fileId = "7a3213f88d7146e88f1508b61dcb3202";//1057加拿大模板
+//            fileId = "45f4b5330f8e47298a4b297b4fabe539";//1075沙特模板
         }
         Object projectObj = map.get("projectId");
         Object machineNoObj = map.get("machineNo");
@@ -1074,9 +1074,6 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             // 创建模板A的副本
             Document cloneDocA = indexDoc[0].deepClone();
             //Document cloneDocA = splitDocs[0].deepClone();
-            // 在合并前插入一个分节符
-            cloneDocA.getLastSection().getBody().appendChild(new Paragraph(cloneDocA));
-            cloneDocA.getLastSection().getBody().getLastParagraph().appendChild(new Run(cloneDocA, "\f")); // 分节符
             // 在副本上合并文档B
             cloneDocA.appendDocument(doc, ImportFormatMode.KEEP_SOURCE_FORMATTING);
             int beforePageCount = cloneDocA.getPageCount();