ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(新旧拆分单对比): 发起对比

Browse Source
This commit is contained in:
yjz
2023-10-20 10:54:57 +08:00
parent 3dbe5c8ce1
commit 249ee12690
8 changed files with 88 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java
+3 -3
View File
@@ -24,13 +24,13 @@ public class SarFileSplitItemsEO implements Serializable {
private String infoId;
@ApiModelProperty(value = "条款号")
private String itemsNum;
private String itemNum;
@ApiModelProperty(value = "条款名称")
private String itemsName;
private String itemTitle;
@ApiModelProperty(value = "条款内容")
private String itermsConditions;
private String itemContent;
@ApiModelProperty(value = "拆分目录id")
private String menuId;
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+10 -10
View File
@@ -238,7 +238,7 @@ public class FileSpiltService {
String numberParent = p.getNumLevelText().substring(0, p.getNumLevelText().lastIndexOf("."));
if (numberMap.containsKey(numberParent)) {
Integer numbernow = (Integer) numberMap.get(numberParent) + 1;
if (messageList != null && !messageList.isEmpty() && messageList.get(messageList.size() - 1).getItemsNum().equals(numberParent + "." + String.valueOf(numbernow))) {
if (messageList != null && !messageList.isEmpty() && messageList.get(messageList.size() - 1).getItemNum().equals(numberParent + "." + String.valueOf(numbernow))) {
numberMap.put(numberParent, numbernow + 1);
paragraphString = numberParent + "." + String.valueOf(numbernow + 1) + paragraphString;
} else {
@@ -265,7 +265,7 @@ public class FileSpiltService {
documentTreeEO1.setPId(generalCatalogueId);
documentTreeEO1.setInfoId(sarFileSplitInfoEO.getId());
documentTreeEO1.setDisplaySeq(treeListDisplay++);
documentTreeEO1.setName(message.getItemsNum());
documentTreeEO1.setName(message.getItemNum());
documentTreeEO1.setValidFlag(0);
// treeList.add(documentTreeEO1);
@@ -346,8 +346,8 @@ public class FileSpiltService {
ptest = Pattern.compile("^附录\\s{0,3}[A-Z]{1}");
matcher = ptest.matcher(paragraphString);
// 获取当前最后一项num
String appendixNum = messageList.get(messageList.size() - 1).getItemsNum().split("\\.")[0];
if (matcher.find()&& !messageList.get(messageList.size() - 1).getItemsNum().equals("附录")) {
String appendixNum = messageList.get(messageList.size() - 1).getItemNum().split("\\.")[0];
if (matcher.find()&& !messageList.get(messageList.size() - 1).getItemNum().equals("附录")) {
if (Integer.valueOf(appendixNum) + 1 <= sarFileSplitInfoEO.getStopNumber()) {
String itemName = "附录";
List<String> clauseContent = new ArrayList<>();
@@ -789,10 +789,10 @@ public class FileSpiltService {
public static SarFileSplitItemsEO getSarFileSplitItemsEO(String infoId, String itemsNum, String itemsName, List<String> itemsCondi) {
SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO();
sarFileSplitItemsEO.setInfoId(infoId);
sarFileSplitItemsEO.setItemsNum(itemsNum);
sarFileSplitItemsEO.setItemsName(itemsName);
sarFileSplitItemsEO.setItemNum(itemsNum);
sarFileSplitItemsEO.setItemTitle(itemsName);
sarFileSplitItemsEO.setItemsCondi(itemsCondi);
sarFileSplitItemsEO.setItermsConditions("");
sarFileSplitItemsEO.setItemContent("");
sarFileSplitItemsEO.setId(UUIDUtils.randomUUID20());
sarFileSplitItemsEO.setValidFlag(0);
sarFileSplitItemsEO.setCreationTime(new Date());
@@ -872,7 +872,7 @@ public class FileSpiltService {
// 像每个条款中依次插入每一段的内容
public static void addItermsConditionsText(SarFileSplitItemsEO message, List<SarFileSplitItemsValEO> itemsValList, String p) {
message.getItemsCondi().add(p);
message.setItermsConditions(message.getItermsConditions() + "<p>" + p + "</p>");
message.setItemTitle(message.getItemContent() + "<p>" + p + "</p>");
itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.TEXT.getValue(), p, message.getItemsCondi().size(), null));
}
@@ -911,7 +911,7 @@ public class FileSpiltService {
rowNum++;
}*/
message.getItemsCondi().add(table.getText());
message.setItermsConditions(message.getItermsConditions() + tabaleStringNew);
message.setItemContent(message.getItemContent() + tabaleStringNew);
itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.TABLE.getValue(), tabaleStringNew.toString(), message.getItemsCondi().size(), null));
}
@@ -929,7 +929,7 @@ public class FileSpiltService {
String imgCon = path;
String imgConVal = "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\"" + path + "\">";
message.getItemsCondi().add(imgConVal);
message.setItermsConditions(message.getItermsConditions() + imgConVal);
message.setItemContent(message.getItemContent() + imgConVal);
itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.IMG.getValue(), imgCon, message.getItemsCondi().size(), null));
} catch (Exception e) {
e.printStackTrace();