WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库--更新log被代替标准不处理

Browse Source
This commit is contained in:
zhn
2022-03-18 17:52:33 +08:00
parent 11951f1bf9
commit d6c3dc4a29
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+20 -13
View File
@@ -477,6 +477,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//处理被代替标准和对应标准 //处理被代替标准和对应标准
List<String> replaceStandardNameList = new ArrayList<>();//代替标准 List<String> replaceStandardNameList = new ArrayList<>();//代替标准
List<String> replacedStandardNameList = new ArrayList<>();//被代替标准 List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
List<String> replacedStandardIdList = new ArrayList<>();//被代替标准
List<String> correspondingStandardNameList = new ArrayList<>();//对应标准 List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
for (Map<String, Object> map : mapList) { for (Map<String, Object> map : mapList) {
//对应标准处理 //对应标准处理
@@ -531,6 +532,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) { if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
String serialNumber = (String) map.get("serial_number"); String serialNumber = (String) map.get("serial_number");
replacedStandardNameList.add(serialNumber); replacedStandardNameList.add(serialNumber);
replacedStandardIdList.add((String) map.get("id"));
} }
} }
//对应标准中文 //对应标准中文
@@ -540,6 +542,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
// } // }
// if (replacedStandardNameList.size() != 0) { // if (replacedStandardNameList.size() != 0) {
dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ",")); dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
// dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ","));
// } // }
// if (replaceStandardNameList.size() != 0) { // if (replaceStandardNameList.size() != 0) {
dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ",")); dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
@@ -1073,7 +1076,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//被代替标准 //被代替标准
for (Map<String, Object> stringObjectMap : mapList) { for (Map<String, Object> stringObjectMap : mapList) {
String replaceStandard = (String) stringObjectMap.get("replace_standard"); String replaceStandard = (String) stringObjectMap.get("replace_standard");
if(replaceStandard.contains((String)entry.getValue())){ if(StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains((String)entry.getValue())){
standSb.append(stringObjectMap.get("serial_number")+","); standSb.append(stringObjectMap.get("serial_number")+",");
} }
} }
@@ -1094,8 +1097,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
} }
String substring = standSb.substring(0, standSb.length() - 1); if(StringUtils.isNotBlank(standSb)){
sb.append(onlCgformField.getDbFieldTxt()+":"+substring+" "); String substring = standSb.substring(0, standSb.length() - 1);
sb.append(onlCgformField.getDbFieldTxt()+":"+substring+" ");
}
} }
} }
@@ -1460,16 +1465,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
valueTemp = getReplaceStandardName(valueTemp); valueTemp = getReplaceStandardName(valueTemp);
} }
} }
//其他类型 //其他类型(被代替标准不处理)
if (ObjectUtils.isNotEmpty(value)) { if(!"replaced_standard".equals(key)){
if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) { if (ObjectUtils.isNotEmpty(value)) {
sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ","); if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
} else if (ObjectUtils.isEmpty(valueTemp)) { sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
sb.append(dbFieldTxt + "由" + value + "改为空" + ","); } else if (ObjectUtils.isEmpty(valueTemp)) {
} sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
} else { }
if (ObjectUtils.isNotEmpty(valueTemp)) { } else {
sb.append(dbFieldTxt + "由空改为" + valueTemp + ","); if (ObjectUtils.isNotEmpty(valueTemp)) {
sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
}
} }
} }
} }