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

ocr识别-文本状态修改来源为文档库

Browse Source
This commit is contained in:
liyawei
2022-04-06 14:19:36 +08:00
parent 0240f31c50
commit 500beebe0d
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class OcrRecordEOServiceImpl extends ServiceImpl<OcrRecordEOMapper, OcrRe
if("文本状态".equals(onlCgformField.getDbFieldTxt())){ if("文本状态".equals(onlCgformField.getDbFieldTxt())){
// 查询文档库所有文件类型的字段名称 // 查询文档库所有文件类型的字段名称
List<OnlCgformField> documentLibraryFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); List<OnlCgformField> documentLibraryFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
documentLibraryFieldList = fieldList.stream() documentLibraryFieldList = documentLibraryFieldList.stream()
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> fieldFileList = documentLibraryFieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList()); List<String> fieldFileList = documentLibraryFieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
map.put("value_list",fieldFileList); map.put("value_list",fieldFileList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+30 -2
View File
@@ -749,8 +749,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if (formFieldList.size() != 0) { if (formFieldList.size() != 0) {
//过滤出表单字段中 控件类型为树结构的 //过滤出表单字段中 控件类型为树结构的
formFieldList = formFieldList.stream() formFieldList = formFieldList.stream()
.filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())))
&& FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
for (OnlCgformField onlCgformField : formFieldList){ for (OnlCgformField onlCgformField : formFieldList){
@@ -762,6 +761,34 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
itemsMap.put(dbFieldName, values); itemsMap.put(dbFieldName, values);
} }
} }
if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")));
if(CollectionUtil.isNotEmpty(sysUserList)){
List<String> realNames = sysUserList.stream().map(SysUser :: getRealname).collect(Collectors.toList());
List<String> userNames = sysUserList.stream().map(SysUser :: getUsername).collect(Collectors.toList());
List<String> names = new ArrayList<>();
for(int i=0; i<realNames.size(); i++){
String name = realNames.get(i) + "(" + userNames.get(i) + ")";
names.add(name);
}
itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
itemsMap.put(dbFieldName, StringUtils.join(names,","));
}
}
}
if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
if(CollectionUtil.isNotEmpty(documentLibraryEOList)){
String names = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),",");
itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
itemsMap.put(dbFieldName, names);
}
}
}
} }
return itemsMap; return itemsMap;
} }
@@ -1953,6 +1980,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
String id = (String)sarFileSplitItemsEO.get("id"); String id = (String)sarFileSplitItemsEO.get("id");
sarFileSplitItemsEO.remove("id"); sarFileSplitItemsEO.remove("id");
sarFileSplitItemsEO.remove("itemValEOList"); sarFileSplitItemsEO.remove("itemValEOList");
sarFileSplitItemsEO = filterMap(sarFileSplitItemsEO);
insertInfo(sarFileSplitItemsEO,id); // 添加条款 insertInfo(sarFileSplitItemsEO,id); // 添加条款
} }