From a4b9aa2a4d592aaa45f7d2e4caac8a0453a791b0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 6 Apr 2022 09:41:29 +0800 Subject: [PATCH] =?UTF-8?q?ocr=E8=AF=86=E5=88=AB-=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90=E4=B8=BA?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OcrRecordEOServiceImpl.java | 25 ++++++++++++------- .../impl/SarFileSplitInfoServiceImpl.java | 10 +++----- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java index 462cdad47..444744b46 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.ocr.entity.OcrRecordEO; import com.jero.modules.ocr.enums.FileSourceEnum; import com.jero.modules.ocr.mapper.OcrRecordEOMapper; @@ -190,7 +191,7 @@ public class OcrRecordEOServiceImpl extends ServiceImpl> getForm(String flag, String cut) { List fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { - //过滤出搜索条件() + //过滤出表单字段 fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); } List> list = new ArrayList<>(); @@ -206,6 +207,14 @@ public class OcrRecordEOServiceImpl extends ServiceImpl documentLibraryFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + documentLibraryFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + List fieldFileList = documentLibraryFieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList()); + map.put("value_list",fieldFileList); + } list.add(map); } return list; @@ -236,20 +245,18 @@ public class OcrRecordEOServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream() - .filter(e->e.getItemValue().equals(ocrRecordEO.getFileType()) - || e.getItemValue().equals(ocrRecordEO.getResultContent()) + .filter(e->e.getItemValue().equals(ocrRecordEO.getResultContent()) || e.getItemValue().equals(ocrRecordEO.getSyncState())) - .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); - ocrRecordEO.setFileType(cnMap.get(ocrRecordEO.getFileType())); + .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化 +// ocrRecordEO.setFileType(cnMap.get(ocrRecordEO.getFileType())); ocrRecordEO.setResultContent(cnMap.get(ocrRecordEO.getResultContent())); ocrRecordEO.setSyncState(cnMap.get(ocrRecordEO.getSyncState())); } else { Map enMap = dictItemListAll.stream() - .filter(e->e.getItemValue().equals(ocrRecordEO.getFileType()) - || e.getItemValue().equals(ocrRecordEO.getResultContent()) + .filter(e->e.getItemValue().equals(ocrRecordEO.getResultContent()) || e.getItemValue().equals(ocrRecordEO.getSyncState())) - .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); - ocrRecordEO.setFileType(enMap.get(ocrRecordEO.getFileType())); + .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化 +// ocrRecordEO.setFileType(enMap.get(ocrRecordEO.getFileType())); ocrRecordEO.setResultContent(enMap.get(ocrRecordEO.getResultContent())); ocrRecordEO.setSyncState(enMap.get(ocrRecordEO.getSyncState())); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 6c3756a5e..b5e23e1a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -178,17 +178,15 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream() - .filter(e->e.getItemValue().equals(splitInfoEO.getFileType()) - || e.getItemValue().equals(splitInfoEO.getSplitResult())) + .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化 - splitInfoEO.setFileType(cnMap.get(splitInfoEO.getFileType())); +// splitInfoEO.setFileType(cnMap.get(splitInfoEO.getFileType())); splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult())); } else { Map enMap = dictItemListAll.stream() - .filter(e->e.getItemValue().equals(splitInfoEO.getFileType()) - || e.getItemValue().equals(splitInfoEO.getSplitResult())) + .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化 - splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType())); +// splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType())); splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult())); } if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {