From a743ee0d07c1cf6a17dec779fa988b833425ae2f Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 26 Apr 2022 14:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9=20=E6=90=9C=E7=B4=A2--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 80 ++++++++++++++----- .../impl/DocumentSearchServiceImpl.java | 3 +- 2 files changed, 63 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 66b769b5e..dc208307f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -347,7 +347,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -1112,6 +1115,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl personnelOnlCgformFieldList = fieldList.stream() .filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + if(personnelOnlCgformFieldList.size() != 0){ List collect = personnelOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List personnelList = new ArrayList<>(); @@ -1128,11 +1132,30 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl standardOnlCgformFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + if(standardOnlCgformFieldList.size() != 0){ + List collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + List standardList = new ArrayList<>(); + for (Map.Entry 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 searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList()); //文件类型字段 @@ -1616,18 +1639,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //标准选择字段 + List standardOnlCgformFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + if(standardOnlCgformFieldList.size() != 0){ + List collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + List standardList = new ArrayList<>(); + for (Map.Entry 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 searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList()); //时间类型字段 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index d78ce1948..9a4db7e43 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -135,7 +135,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { List 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 otherFieldList = otherOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());