diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 1b003f03..026dfcc0 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -256,6 +256,7 @@ public class FileSpiltService { stringBuilder.append(smalltext); } } + ParagraphAlignment alignment = p.getAlignment(); // 处理段落生成编号不识别问题 String paragraphString = stringBuilder.toString(); if (StringUtils.isNotBlank(paragraphString)) { @@ -384,7 +385,7 @@ public class FileSpiltService { preNameNum = g; message.setMenuId(sarFileSplitMenuEO.getId()); if(!StringUtils.isEmpty(itemName)){ - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()), alignment); } message.setApplicableComponents(partName); messageList.add(message); @@ -408,7 +409,7 @@ public class FileSpiltService { SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), "附录", itemName, clauseContent); // 增加一条数据,需要在数结构中加一条数据 SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList("附录", treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue); - addItermsConditionsText(message, itemValList, paragraphString); + addItermsConditionsText(message, itemValList, paragraphString, alignment); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); message.setApplicableComponents(partName); @@ -419,7 +420,7 @@ public class FileSpiltService { } } else { if (!paragraphString.equals("")) { - addItermsConditionsText(messageList.get(messageList.size() - 1), itemValList, paragraphString); + addItermsConditionsText(messageList.get(messageList.size() - 1), itemValList, paragraphString, alignment); } List imageBundleList = readImageInParagraph((XWPFParagraph) p); if (CollectionUtils.isNotEmpty(imageBundleList)) { @@ -1030,9 +1031,13 @@ public class FileSpiltService { } // 像每个条款中依次插入每一段的内容 - public static void addItermsConditionsText(SarFileSplitItemsEO message, List itemsValList, String p) { + public static void addItermsConditionsText(SarFileSplitItemsEO message, List itemsValList, String p, ParagraphAlignment alignment) { message.getItemsCondi().add(p); - message.setItemContent(message.getItemContent() + "

" + p + "

"); + if (ParagraphAlignment.CENTER.equals(alignment)){ + message.setItemContent(message.getItemContent() + "

" + p + "

"); + }else { + message.setItemContent(message.getItemContent() + "

" + p + "

"); + } itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.TEXT.getValue(), p, message.getItemsCondi().size(), null)); }