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-04-26 14:36:10 +08:00
parent 94e7b8952f a743ee0d07
commit e550fb792a
2 changed files with 63 additions and 20 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
+61 -19
View File
@@ -347,7 +347,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|| FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())//下拉多选
|| FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())//日期单选
|| FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())//日期多选
|| FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())))//树形
|| FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())//树形
|| FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())//人员选择
// || FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())
))
.collect(Collectors.toList());
}
} else {
@@ -1099,12 +1102,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} catch (Exception e) {
throw new JeroBootException(e.getMessage());
}
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"));
}
// 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"));
// }
//字段属性
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
@@ -1112,6 +1115,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//过滤所有人员选择类型的字段
List<OnlCgformField> personnelOnlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
if(personnelOnlCgformFieldList.size() != 0){
List<String> collect = personnelOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
List<String> personnelList = new ArrayList<>();
@@ -1128,11 +1132,30 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
}
//标准选择字段
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");
map.remove("replace_standard_id");
map.remove("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());
//文件类型字段
@@ -1616,18 +1639,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} catch (ParseException e) {
throw new JeroBootException(e.getMessage());
}
String cut = (String) map.get("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("cut");
map.remove("replace_standard_id");
map.remove("corresponding_standard_id");
//字段属性
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");
}
}
}
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());
//时间类型字段
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+2 -1
View File
@@ -135,7 +135,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
List<OnlCgformField> otherOnlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())//下拉单选
|| FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())//下拉多选
|| FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))//树形
|| FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())//树形
|| FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType()))//人员选择
.collect(Collectors.toList());
List<String> otherFieldList = otherOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());