FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!103
This commit is contained in:
高嵩
2023-06-14 12:00:17 +08:00
parent 67106e61f6 444f8e1345
commit b4870471c9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+1 -1
View File
@@ -273,7 +273,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if(ObjectUtils.isNotEmpty(bussionessStand)){
sn = bussionessStand.getNewStandSn();
}
if (StringUtils.isBlank(MaxSn) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
if ((StringUtils.isBlank(MaxSn) || !MaxSn.equals(standMaxSn)) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
saveBussStandSn(reviseStatus, standSort, sn, taskId);
}
bussionessStand.setStandSn(sn);
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+6 -2
View File
@@ -214,7 +214,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
paragraphString = paragraphString.replaceAll("\r\n","");
paragraphString = paragraphString.replaceAll("\n","");
paragraphString = paragraphString.trim();
if ("前言".equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
if (getChinese("前言").equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
.replaceAll("\b", "").replaceAll(" ", "").length() == 2)) { // 前言后面有文本，判定为是目录中的前言
firstFlag = false;
}
@@ -595,7 +595,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
}
String text = buffer.toString();
if (length > 0) {
text = text.substring(length);
try {
text = text.substring(length);
}catch (Exception e){
e.printStackTrace();
}
}
message.getItemsCondi().add(text);
message.setItermsConditions(message.getItermsConditions() + "<p>" + text + "<p>");