From eb63d96c96a52860ab79b7dc39238c37d5ee0175 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 10 May 2022 18:00:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 209 +++++++++++------- 1 file changed, 126 insertions(+), 83 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 2e87c9296..04fa1b709 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 @@ -612,99 +612,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); - //对应标准id - String correspondingStandard = (String) dataList.get(0).get("corresponding_standard"); - //代替标准id - String replaceStandardTemp = (String) dataList.get(0).get("replace_standard"); //处理被代替标准和对应标准 - List replaceStandardNameList = new ArrayList<>();//代替标准 List replacedStandardNameList = new ArrayList<>();//被代替标准 - List replacedStandardIdList = new ArrayList<>();//被代替标准 - List correspondingStandardNameList = new ArrayList<>();//对应标准 for (Map map : mapList) { - //对应标准处理 - if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) { - for (String s : correspondingStandard.split(",")) { - if (s.equals((String) map.get("id"))) { - correspondingStandardNameList.add((String) map.get("serial_number")); - } else { - boolean flag = isId(s); - if (!flag && !correspondingStandardNameList.contains(s)) { - correspondingStandardNameList.add(s); - } - } - } - } else { - //处理已删除的文档的对应标准 - if (StringUtils.isNotBlank(correspondingStandard)) { - for (String s : correspondingStandard.split(",")) { - boolean flag = isId(s); - if (!flag && !correspondingStandardNameList.contains(s)) { - correspondingStandardNameList.add(s); - } - } - } - } - //代替标准 - if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) { - for (String s : replaceStandardTemp.split(",")) { - if (s.equals((String) map.get("id"))) { - replaceStandardNameList.add((String) map.get("serial_number")); - } else { - boolean flag = isId(s); - if (!flag && !replaceStandardNameList.contains(s)) { - replaceStandardNameList.add(s); - } - } - } - } else { - //处理已删除的代替标准 - if (StringUtils.isNotBlank(replaceStandardTemp)) { - for (String s : replaceStandardTemp.split(",")) { - boolean flag = isId(s); - if (!flag && !replaceStandardNameList.contains(s)) { - replaceStandardNameList.add(s); - } - } - } - - } //被代替标准 String replaceStandard = (String) map.get("replace_standard"); - if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) { + if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains((String) dataList.get(0).get("serial_number"))) { String serialNumber = (String) map.get("serial_number"); replacedStandardNameList.add(serialNumber); - replacedStandardIdList.add((String) map.get("id")); } } - //对应标准中文 -// if (correspondingStandardNameList.size() != 0) { - dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ",")); - dataList.get(0).put("corresponding_standard_id", correspondingStandard); -// } -// if (replacedStandardNameList.size() != 0) { dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ",")); -// dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ",")); -// } -// if (replaceStandardNameList.size() != 0) { - dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ",")); - dataList.get(0).put("replace_standard_id", replaceStandardTemp); -// } - //代替标准中文 -// String replaceStandard = (String) dataList.get(0).get("replace_standard"); -// if (StringUtils.isNotBlank(replaceStandard)) { -// LambdaQueryWrapper queryWrapperTemp = new LambdaQueryWrapper<>(); -// queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(","))); -// List> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp); -// if (dataListTemp.size() != 0) { -// List replaceStandardListNew = new ArrayList<>(); -// for (Map map : dataListTemp) { -// replaceStandardListNew.add((String) map.get("serial_number")); -// } -// dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ",")); -// dataList.get(0).put("replace_standard_id", replaceStandard); -// } -// } for (Map.Entry entry : dataList.get(0).entrySet()) { if(treeList.contains(entry.getKey())){ String value = (String) entry.getValue(); @@ -717,6 +635,131 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getDocumentInfoById(String id, String cut) { +// //字段属性 +// List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); +// List treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); +// List treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); +// List onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); +// List dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); +// //通过id查询数据 +// List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); +// //多选日期 +// for (Map.Entry entry : dataList.get(0).entrySet()) { +// String key = entry.getKey(); +// if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){ +// String value = (String) entry.getValue(); +// entry.setValue(Arrays.asList(value.split(","))); +// } +// } +// +// //查询所有 +// List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); +// //对应标准id +// String correspondingStandard = (String) dataList.get(0).get("corresponding_standard"); +// //代替标准id +// String replaceStandardTemp = (String) dataList.get(0).get("replace_standard"); +// //处理被代替标准和对应标准 +// List replaceStandardNameList = new ArrayList<>();//代替标准 +// List replacedStandardNameList = new ArrayList<>();//被代替标准 +// List replacedStandardIdList = new ArrayList<>();//被代替标准 +// List correspondingStandardNameList = new ArrayList<>();//对应标准 +// for (Map map : mapList) { +// //对应标准处理 +// if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) { +// for (String s : correspondingStandard.split(",")) { +// if (s.equals((String) map.get("id"))) { +// correspondingStandardNameList.add((String) map.get("serial_number")); +// } else { +// boolean flag = isId(s); +// if (!flag && !correspondingStandardNameList.contains(s)) { +// correspondingStandardNameList.add(s); +// } +// } +// } +// } else { +// //处理已删除的文档的对应标准 +// if (StringUtils.isNotBlank(correspondingStandard)) { +// for (String s : correspondingStandard.split(",")) { +// boolean flag = isId(s); +// if (!flag && !correspondingStandardNameList.contains(s)) { +// correspondingStandardNameList.add(s); +// } +// } +// } +// } +// //代替标准 +// if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) { +// for (String s : replaceStandardTemp.split(",")) { +// if (s.equals((String) map.get("id"))) { +// replaceStandardNameList.add((String) map.get("serial_number")); +// } else { +// boolean flag = isId(s); +// if (!flag && !replaceStandardNameList.contains(s)) { +// replaceStandardNameList.add(s); +// } +// } +// } +// } else { +// //处理已删除的代替标准 +// if (StringUtils.isNotBlank(replaceStandardTemp)) { +// for (String s : replaceStandardTemp.split(",")) { +// boolean flag = isId(s); +// if (!flag && !replaceStandardNameList.contains(s)) { +// replaceStandardNameList.add(s); +// } +// } +// } +// +// } +// //被代替标准 +// String replaceStandard = (String) map.get("replace_standard"); +// if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) { +// String serialNumber = (String) map.get("serial_number"); +// replacedStandardNameList.add(serialNumber); +// replacedStandardIdList.add((String) map.get("id")); +// } +// } +// //对应标准中文 +//// if (correspondingStandardNameList.size() != 0) { +// dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ",")); +// dataList.get(0).put("corresponding_standard_id", correspondingStandard); +//// } +//// if (replacedStandardNameList.size() != 0) { +// dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ",")); +//// dataList.get(0).put("replaced_standard_id", StringUtils.join(replacedStandardIdList, ",")); +//// } +//// if (replaceStandardNameList.size() != 0) { +// dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ",")); +// dataList.get(0).put("replace_standard_id", replaceStandardTemp); +//// } +// //代替标准中文 +//// String replaceStandard = (String) dataList.get(0).get("replace_standard"); +//// if (StringUtils.isNotBlank(replaceStandard)) { +//// LambdaQueryWrapper queryWrapperTemp = new LambdaQueryWrapper<>(); +//// queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(","))); +//// List> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp); +//// if (dataListTemp.size() != 0) { +//// List replaceStandardListNew = new ArrayList<>(); +//// for (Map map : dataListTemp) { +//// replaceStandardListNew.add((String) map.get("serial_number")); +//// } +//// dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ",")); +//// dataList.get(0).put("replace_standard_id", replaceStandard); +//// } +//// } +// for (Map.Entry entry : dataList.get(0).entrySet()) { +// if(treeList.contains(entry.getKey())){ +// String value = (String) entry.getValue(); +// if(StringUtils.isNotBlank(value)){ +// dataList.get(0).put(entry.getKey(), Arrays.asList(value.split(","))); +// }else{ +// dataList.get(0).put(entry.getKey(), null); +// } +// } +// } +// return dataList; +// } /** * 详情数据查询