QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): un 拆分目录编号、标题小数点错乱问题解决

Browse Source
This commit is contained in:
yjz
2024-08-05 12:46:58 +08:00
parent a1532c5989
commit f3afbe5310
1 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+40 -12
View File
@@ -409,7 +409,7 @@ public class FileSpiltService {
menuCanAdd = false; menuCanAdd = false;
} else { } else {
// 增加一条数据，需要在数结构中加一条数据 // 增加一条数据，需要在数结构中加一条数据
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue, startDigit);
treeList.add(sarFileSplitMenuEO); treeList.add(sarFileSplitMenuEO);
preName = startDigit; preName = startDigit;
preNameNum = g; preNameNum = g;
@@ -437,7 +437,7 @@ public class FileSpiltService {
clauseContent.add(paragraphString); clauseContent.add(paragraphString);
SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), itemName, "", clauseContent); SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), itemName, "", clauseContent);
// 增加一条数据，需要在数结构中加一条数据 // 增加一条数据，需要在数结构中加一条数据
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(itemName, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue); SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(itemName, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue, startDigit);
//addItermsConditionsText(message, itemValList, paragraphString, alignment); //addItermsConditionsText(message, itemValList, paragraphString, alignment);
treeList.add(sarFileSplitMenuEO); treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId()); message.setMenuId(sarFileSplitMenuEO.getId());
@@ -562,12 +562,12 @@ public class FileSpiltService {
} }
public static SarFileSplitMenuEO getTreeList(String name, public static SarFileSplitMenuEO getTreeList(String name,
List<SarFileSplitMenuEO> treeList, List<SarFileSplitMenuEO> treeList,
String generalCatalogueId, String generalCatalogueId,
SarFileSplitInfoEO sarFileSplitInfoEO, SarFileSplitInfoEO sarFileSplitInfoEO,
Long treeListDisplay, Long treeListDisplay,
String itemName, String itemName,
SplitFileTypeTypeEnum enumByValue) { SplitFileTypeTypeEnum enumByValue, String startDigit) {
SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(); SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO();
// SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),name,sarFileSplitInfoEO.getId(),treeListDisplay,itemName); // SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),name,sarFileSplitInfoEO.getId(),treeListDisplay,itemName);
@@ -583,6 +583,7 @@ public class FileSpiltService {
boolean oneFlag = false; boolean oneFlag = false;
boolean twoFlag = false; boolean twoFlag = false;
boolean threeFlag = false; boolean threeFlag = false;
List<String> dotList = new ArrayList<>();
a: a:
for (SarFileSplitMenuEO forDocumentTree : treeList) { for (SarFileSplitMenuEO forDocumentTree : treeList) {
String treeName = forDocumentTree.getName(); String treeName = forDocumentTree.getName();
@@ -606,6 +607,14 @@ public class FileSpiltService {
} }
break; break;
default: default:
if (name.endsWith(".")){
// 处理末尾为小数点的数据
name = name.substring(0, name.length() - 1);
dotList.add(forDocumentTree.getId());
}
if (treeName.endsWith(".")){
treeName = treeName.substring(0, treeName.length() - 1);
}
if (name.indexOf(".") >= 0) { if (name.indexOf(".") >= 0) {
if (name.substring(0, name.lastIndexOf(".")).equals(treeName)) { if (name.substring(0, name.lastIndexOf(".")).equals(treeName)) {
documentTreeEO.setPId(forDocumentTree.getId()); documentTreeEO.setPId(forDocumentTree.getId());
@@ -616,9 +625,18 @@ public class FileSpiltService {
documentTreeEO.setPId(generalCatalogueId); documentTreeEO.setPId(generalCatalogueId);
// pIdList.add(generalCatalogueId); // pIdList.add(generalCatalogueId);
} }
if (startDigit.equals(name + ".")){
documentTreeEO.setName(name + ".");
}
break; break;
} }
}
// 补回小数点
for (SarFileSplitMenuEO forDocumentTree : treeList) {
if (dotList.contains(forDocumentTree.getId())) {
forDocumentTree.setName(forDocumentTree.getName() + ".");
}
} }
return documentTreeEO; return documentTreeEO;
} }
@@ -1330,13 +1348,23 @@ public class FileSpiltService {
// String itemName = paragraphString.substring(nowStart.get(i).length()).length()>10?paragraphString.substring(nowStart.get(i).length(),nowStart.get(i).length()+10):paragraphString.substring(nowStart.get(i).length()); // String itemName = paragraphString.substring(nowStart.get(i).length()).length()>10?paragraphString.substring(nowStart.get(i).length(),nowStart.get(i).length()+10):paragraphString.substring(nowStart.get(i).length());
// String itemName = FileSplitUtils.getItemName(paragraphString, startDigit); // String itemName = FileSplitUtils.getItemName(paragraphString, startDigit);
String itemName; String itemName;
String tempnowStart = nowStart.get(i);
if (startDigit.equals(nowStart.get(i)+ ".")){
tempnowStart = nowStart.get(i)+ ".";
}
if (nowStart.get(i).equals("1")){
nowStart.set(i, "1.");
}
if (paragraphString.indexOf(nowStart.get(i)) == 0){ if (paragraphString.indexOf(nowStart.get(i)) == 0){
itemName = paragraphString.substring(nowStart.get(i).length()).trim().length() > 10 ? paragraphString.substring(nowStart.get(i).length()).trim().substring(0,10) :paragraphString.substring(nowStart.get(i).length()).trim(); itemName = paragraphString.substring(tempnowStart.length()).trim().length() > 10 ? paragraphString.substring(tempnowStart.length()).trim().substring(0,10) :paragraphString.substring(tempnowStart.length()).trim();
}else { }else {
itemName = paragraphString.substring(nowStart.get(i).length()).length() > 10 ? paragraphString.substring(nowStart.get(i).length(), nowStart.get(i).length() + 10) : paragraphString.substring(nowStart.get(i).length()); itemName = paragraphString.substring(tempnowStart.length()).length() > 10 ? paragraphString.substring(tempnowStart.length(), tempnowStart.length() + 10) : paragraphString.substring(tempnowStart.length());
} }
List<String> clauseContent = new ArrayList<>(); List<String> clauseContent = new ArrayList<>();
clauseContent.add(paragraphString); clauseContent.add(paragraphString);
if (startDigit.equals("1")){
startDigit = "1.";
}
SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), startDigit, itemName, clauseContent); SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), startDigit, itemName, clauseContent);
String[] numberStr = nowStart.get(i).split("\\."); String[] numberStr = nowStart.get(i).split("\\.");
@@ -1346,7 +1374,7 @@ public class FileSpiltService {
menuCanAdd = false; menuCanAdd = false;
} else { } else {
// 增加一条数据，需要在数结构中加一条数据 // 增加一条数据，需要在数结构中加一条数据
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue, startDigit);
treeList.add(sarFileSplitMenuEO); treeList.add(sarFileSplitMenuEO);
preName = nowStart.get(i); preName = nowStart.get(i);
preNameNum = g; preNameNum = g;
@@ -1394,7 +1422,7 @@ public class FileSpiltService {
// SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), "annex", itemName, clauseContent); // SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), "annex", itemName, clauseContent);
SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), itemName, "", clauseContent); SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(), itemName, "", clauseContent);
// 增加一条数据，需要在数结构中加一条数据 // 增加一条数据，需要在数结构中加一条数据
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(itemName, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue); SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(itemName, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, "", enumByValue, startDigit);
addItermsConditionsText(message, itemValList, paragraphString, p.getAlignment()); addItermsConditionsText(message, itemValList, paragraphString, p.getAlignment());
treeList.add(sarFileSplitMenuEO); treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId()); message.setMenuId(sarFileSplitMenuEO.getId());