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-14 17:18:28 +08:00
parent 52134d926d
commit d481985603
1 changed files with 159 additions and 137 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
+159 -137
View File
@@ -2793,32 +2793,33 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
} }
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + fileId;
} else {
yuan = fileId;
}
} }
} }
} }
} else { } else {
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) { for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId("h-" + SarStandardsInfo.getStandId()); fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
} }
}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); String theSame = isTheSame(byId.getOldFileName(), bid);
@@ -2826,19 +2827,20 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
yuan = "," + SarStandardsInfo.getFileId();
} else {
yuan = SarStandardsInfo.getFileId();
}
} }
} else {
if (StringUtils.isNotBlank(yuan)) {
yuan = "," + SarStandardsInfo.getFileId();
} else {
yuan = SarStandardsInfo.getFileId();
}
} }
} }
} }
@@ -2868,26 +2870,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = "," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
} else { } else {
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) { for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId("h-" + SarStandardsInfo.getStandId()); fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
@@ -2901,17 +2905,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = "," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
} }
} }
} }
@@ -2980,26 +2986,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = "," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
} else { } else {
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) { for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId("h-" + SarStandardsInfo.getStandId()); fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
@@ -3013,19 +3021,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = "," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
}
}
} }
} }
} }
@@ -3055,26 +3065,28 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = "," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
} else { } else {
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) { for (AttFileEO fileEO : attFileEOS) {
fileEO.setResId("h-" + SarStandardsInfo.getStandId()); fileEO.setResId(SarStandardsInfo.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
@@ -3088,17 +3100,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = "," + SarStandardsInfo.getFileId();
} else {
yi = SarStandardsInfo.getFileId();
}
} else { } else {
yi = SarStandardsInfo.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + SarStandardsInfo.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = SarStandardsInfo.getFileId();
yuan = "," + SarStandardsInfo.getFileId(); }
} else {
yuan = SarStandardsInfo.getFileId();
} }
} }
} }
@@ -3169,19 +3183,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = "," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
@@ -3189,7 +3205,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO:attFileEOS) { for (AttFileEO fileEO:attFileEOS) {
//记录重复 此id企业或者海外的id //记录重复 此id企业或者海外的id
fileEO.setResId("q-"+sarBussionessStand.getStandId()); fileEO.setResId(sarBussionessStand.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
@@ -3204,19 +3220,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = "," + sarBussionessStand.getFileId();
} else {
yi = sarBussionessStand.getFileId();
}
} else { } else {
yi = sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + sarBussionessStand.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = sarBussionessStand.getFileId();
yuan = "," + sarBussionessStand.getFileId(); }
} else {
yuan = sarBussionessStand.getFileId();
}
}
} }
} }
} }
@@ -3246,19 +3264,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + fileId; if (StringUtils.isNotBlank(yi)) {
yi = "," + fileId;
} else {
yi = fileId;
}
} else { } else {
yi = fileId; if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + fileId;
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = fileId;
yuan = "," + fileId; }
} else {
yuan = fileId;
}
}
} }
} }
} }
@@ -3266,7 +3286,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//记录 同一条数据名称一样的 //记录 同一条数据名称一样的
for (AttFileEO fileEO : attFileEOS) { for (AttFileEO fileEO : attFileEOS) {
//记录重复 此id企业或者海外的id //记录重复 此id企业或者海外的id
fileEO.setResId("q-" + sarBussionessStand.getStandId()); fileEO.setResId(sarBussionessStand.getStandId());
fileEOArrayList.add(fileEO); fileEOArrayList.add(fileEO);
} }
} }
@@ -3280,19 +3300,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//证明找到文件名称一致的了 //证明找到文件名称一致的了
OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId()); OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
//原文译文 进行判断 //原文译文 进行判断
if (sortSign.getSortSign().contains("译")) { if(sortSign != null) {
if (StringUtils.isNotBlank(yi)) { if (sortSign.getSortSign().contains("译")) {
yi = "," + sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yi)) {
yi = "," + sarBussionessStand.getFileId();
} else {
yi = sarBussionessStand.getFileId();
}
} else { } else {
yi = sarBussionessStand.getFileId(); if (StringUtils.isNotBlank(yuan)) {
} yuan = "," + sarBussionessStand.getFileId();
} else { } else {
if (StringUtils.isNotBlank(yuan)) { yuan = sarBussionessStand.getFileId();
yuan = "," + sarBussionessStand.getFileId(); }
} else {
yuan = sarBussionessStand.getFileId();
}
}
} }
} }
} }