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

校验优化

Browse Source
This commit is contained in:
gaojiabao
2023-03-20 16:27:55 +08:00
parent 994e4acbbb
commit b4946c9ecc
1 changed files with 224 additions and 198 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
+224 -198
View File
@@ -2650,27 +2650,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(),bid); if(byId!=null) {
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), bid);
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = yuan+"," + fileId; }
} else {
yuan = fileId;
} }
} }
}
}
} }
} }
} else { } else {
@@ -2765,23 +2767,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}else { }else {
String id = SarStandardsInfo.getFileId(); String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), bid); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), bid);
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = yuan+"," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
} }
} }
} }
@@ -2810,25 +2814,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = yuan+"," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
@@ -2926,23 +2932,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = SarStandardsInfo.getFileId(); String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = yuan+"," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
} }
} }
} }
@@ -3009,27 +3017,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(),bid); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(),bid);
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = yuan+"," + fileId; }
} else {
yuan = fileId;
} }
} }
}
}
} }
} }
} else { } else {
@@ -3124,23 +3134,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}else { }else {
String id = SarStandardsInfo.getFileId(); String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), bid); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), bid);
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = yuan+"," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
} }
} }
} }
@@ -3169,25 +3181,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = yuan+"," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
@@ -3285,23 +3299,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = SarStandardsInfo.getFileId(); String id = SarStandardsInfo.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId()); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = yuan+"," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
} }
} }
} }
@@ -3368,28 +3384,31 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(),bid); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(),bid);
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = yuan+"," + fileId; }
} else {
yuan = fileId;
} }
} }
}
}
} }
} }
} else { } else {
int numberCount = 0; int numberCount = 0;
@@ -3483,23 +3502,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}else { }else {
String id = sarBussionessStand.getFileId(); String id = sarBussionessStand.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), bid); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), bid);
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + sarBussionessStand.getFileId();
} else {
yi = sarBussionessStand.getFileId();
}
} else { } else {
yi = sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + sarBussionessStand.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = sarBussionessStand.getFileId();
yuan = yuan+"," + sarBussionessStand.getFileId(); }
} else {
yuan = sarBussionessStand.getFileId();
} }
} }
} }
@@ -3528,28 +3549,31 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = fileId; String id = fileId;
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = yuan+"," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
} }
} else { } else {
int numberCount = 0; int numberCount = 0;
@@ -3644,23 +3668,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//循环调用每一个 文件 获取文件名称 //循环调用每一个 文件 获取文件名称
String id = sarBussionessStand.getFileId(); String id = sarBussionessStand.getFileId();
AttFileEO byId = attFileEOService.getFileInfo(id); AttFileEO byId = attFileEOService.getFileInfo(id);
String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId()); if(byId!=null){
if (theSame.equals("1")) { String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
//证明找到文件名称一致的了 if (theSame.equals("1")) {
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); //证明找到文件名称一致的了
//原文译文 进行判断 OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
if(sortSign != null) { //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = yi+"," + sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = yi+"," + sarBussionessStand.getFileId();
} else {
yi = sarBussionessStand.getFileId();
}
} else { } else {
yi = sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = yuan+"," + sarBussionessStand.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = sarBussionessStand.getFileId();
yuan = yuan+"," + sarBussionessStand.getFileId(); }
} else {
yuan = sarBussionessStand.getFileId();
} }
} }
} }