From ff28ea5237722f824e652e7f69f8d19d7fe90b12 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 31 Mar 2022 14:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E9=99=A4=E6=96=87=E6=9C=AC=E4=BF=A1=E6=81=AF,?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF=E4=B9=8B=E5=A4=96=E7=9A=84?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=B8=AD=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 110 ++++++++++-------- 1 file changed, 60 insertions(+), 50 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 aec69fe3f..de360c7f7 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 @@ -904,66 +904,76 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map = new HashMap<>(); //处理文件 if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) { - if (StringUtils.isNotBlank(value)) { + //处理文本信息和关联信息区域之外的区域中文件类型字段返归结果格式 + if(!"文本信息".equals(onlCgformAreaTemp.getShowArea()) || !"关联信息".equals(onlCgformAreaTemp.getShowArea())){ List fileInfos = iOSSFileService.getFileInfosByConnectId(value); - //多文件处理 - if (fileInfos.size() > 1) { - if (fileInfos.size() != 0) { - int i = 0; - for (OSSFile fileInfo : fileInfos) { - if (i == 0) { - Map mapNew = new HashMap<>(); - mapNew.put("value", fileInfo); - mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); - mapNew.put("count", fileInfos.size()); - // 添加标准分解单跳转 - List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId()); - if (CollectionUtil.isNotEmpty(infoEOList)) { - mapNew.put("splitFlag", 1); - mapNew.put("splitInfoId", infoEOList.get(0).getId()); - } else{ - mapNew.put("splitFlag", 0); - } + List fileIdList = fileInfos.stream().map(OSSFile::getId).collect(Collectors.toList()); + Map mapNew = new HashMap<>(); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + mapNew.put("value",fileIdList); + resultTemp.add(mapNew); + }else{ + if (StringUtils.isNotBlank(value)) { + List fileInfos = iOSSFileService.getFileInfosByConnectId(value); + //多文件处理 + if (fileInfos.size() > 1) { + if (fileInfos.size() != 0) { + int i = 0; + for (OSSFile fileInfo : fileInfos) { + if (i == 0) { + Map mapNew = new HashMap<>(); + mapNew.put("value", fileInfo); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + mapNew.put("count", fileInfos.size()); + // 添加标准分解单跳转 + List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId()); + if (CollectionUtil.isNotEmpty(infoEOList)) { + mapNew.put("splitFlag", 1); + mapNew.put("splitInfoId", infoEOList.get(0).getId()); + } else{ + mapNew.put("splitFlag", 0); + } - resultTemp.add(mapNew); - i++; - } else { - Map mapNew = new HashMap<>(); - mapNew.put("value", fileInfo); - mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); - // 添加标准分解单跳转 - List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId()); - if (CollectionUtil.isNotEmpty(infoEOList)) { - mapNew.put("splitFlag", 1); - mapNew.put("splitInfoId", infoEOList.get(0).getId()); - } else{ - mapNew.put("splitFlag", 0); + resultTemp.add(mapNew); + i++; + } else { + Map mapNew = new HashMap<>(); + mapNew.put("value", fileInfo); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + // 添加标准分解单跳转 + List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId()); + if (CollectionUtil.isNotEmpty(infoEOList)) { + mapNew.put("splitFlag", 1); + mapNew.put("splitInfoId", infoEOList.get(0).getId()); + } else{ + mapNew.put("splitFlag", 0); + } + resultTemp.add(mapNew); } - resultTemp.add(mapNew); } } + } else if (fileInfos.size() == 1) { + //单个文件处理 + Map mapNew = new HashMap<>(); + mapNew.put("count", fileInfos.size()); + mapNew.put("value", fileInfos.get(0)); + mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + // 添加标准分解单跳转 + List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfos.get(0).getId()); + if (CollectionUtil.isNotEmpty(infoEOList)) { + mapNew.put("splitFlag", 1); + mapNew.put("splitInfoId", infoEOList.get(0).getId()); + } else{ + mapNew.put("splitFlag", 0); + } + resultTemp.add(mapNew); } - } else if (fileInfos.size() == 1) { - //单个文件处理 + } else { Map mapNew = new HashMap<>(); - mapNew.put("count", fileInfos.size()); - mapNew.put("value", fileInfos.get(0)); + mapNew.put("value", ""); mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); - // 添加标准分解单跳转 - List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfos.get(0).getId()); - if (CollectionUtil.isNotEmpty(infoEOList)) { - mapNew.put("splitFlag", 1); - mapNew.put("splitInfoId", infoEOList.get(0).getId()); - } else{ - mapNew.put("splitFlag", 0); - } resultTemp.add(mapNew); } - } else { - Map mapNew = new HashMap<>(); - mapNew.put("value", ""); - mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); - resultTemp.add(mapNew); } } else { //处理字段类型为文件之外的字段