From 0e3fb3212fe9ff9ee6929ee519868afd5e5329f0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 26 Mar 2024 14:18:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=99=84=E5=BD=95ABC=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) 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 19c6576e..138f6455 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 @@ -412,24 +412,20 @@ public class FileSpiltService { // 判断是否是附录 boolean find = APPENDIX_PATTERN.matcher(paragraphString).find(); // 获取当前最后一项num - String appendixNum = messageList.get(messageList.size() - 1).getItemNum().split("\\.")[0]; + //String appendixNum = messageList.get(messageList.size() - 1).getItemNum().split("\\.")[0]; if (find && !messageList.get(messageList.size() - 1).getItemNum().equals("附录")) { - if (Integer.valueOf(appendixNum) + 1 <= sarFileSplitInfoEO.getStopNumber()) { - String itemName = "附录"; - List clauseContent = new ArrayList<>(); - clauseContent.add(paragraphString); - SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), "附录", itemName, clauseContent); - // 增加一条数据，需要在数结构中加一条数据 - SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList("附录", treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue); - addItermsConditionsText(message, itemValList, paragraphString, alignment); - treeList.add(sarFileSplitMenuEO); - message.setMenuId(sarFileSplitMenuEO.getId()); - message.setApplicableComponents(partName); - messageList.add(message); - nowStart = new ArrayList<>(); - } else { - break; - } + String itemName = paragraphString; + List clauseContent = new ArrayList<>(); + clauseContent.add(paragraphString); + SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), itemName, "", clauseContent); + // 增加一条数据，需要在数结构中加一条数据 + SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(itemName, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue); + //addItermsConditionsText(message, itemValList, paragraphString, alignment); + treeList.add(sarFileSplitMenuEO); + message.setMenuId(sarFileSplitMenuEO.getId()); + message.setApplicableComponents(partName); + messageList.add(message); + nowStart = new ArrayList<>(); } else { if (!paragraphString.equals("")) { addItermsConditionsText(messageList.get(messageList.size() - 1), itemValList, paragraphString, alignment);