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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-05-10 15:52:05 +08:00
parent 6059f907ea 17acba2d4a
commit 0edea6c9ad
1 changed files with 26 additions and 34 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
+26 -34
View File
@@ -1635,34 +1635,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
//标准选择字段
List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
if(standardOnlCgformFieldList.size() != 0){
List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
List<String> standardList = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
if(collect.contains(key)){
standardList.add(key);
}
}
if(standardList.size() != 0){
for (String standard : standardList) {
map.put(standard, map.get(standard+"_id"));
map.remove(standard+"_id");
}
}
}
// List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
// .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
// if(standardOnlCgformFieldList.size() != 0){
// List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
// List<String> standardList = new ArrayList<>();
// for (Map.Entry<String, Object> entry : map.entrySet()) {
// String key = entry.getKey();
// if(collect.contains(key)){
// standardList.add(key);
// }
// }
// if(standardList.size() != 0){
// for (String standard : standardList) {
// map.put(standard, map.get(standard+"_id"));
// map.remove(standard+"_id");
// }
// }
// }
String cut = (String) map.get("cut");
map.remove("cut");
// if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
// map.put("replace_standard", map.get("replace_standard_id"));
// }
// if (ObjectUtils.isNotEmpty(map.get("corresponding_standard_id"))) {
// map.put("corresponding_standard", map.get("corresponding_standard_id"));
// }
// map.remove("replace_standard_id");
// map.remove("corresponding_standard_id");
//获取搜索中心字段
List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
//时间类型字段
@@ -2210,14 +2202,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
} else {
if ("replace_standard".equals(key) || "corresponding_standard".equals(key)) {
if (ObjectUtils.isNotEmpty(value)) {
value = getReplaceStandardName(value);
}
if (ObjectUtils.isNotEmpty(valueTemp)) {
valueTemp = getReplaceStandardName(valueTemp);
}
}
// if ("replace_standard".equals(key) || "corresponding_standard".equals(key)) {
// if (ObjectUtils.isNotEmpty(value)) {
// value = getReplaceStandardName(value);
// }
// if (ObjectUtils.isNotEmpty(valueTemp)) {
// valueTemp = getReplaceStandardName(valueTemp);
// }
// }
//其他类型(被代替标准不处理)
if (!"replaced_standard".equals(key)) {
if (ObjectUtils.isNotEmpty(value)) {