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 fe99f20a1..534c8720b 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 @@ -355,19 +355,39 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = bussDocumentLibraryEOMapper.selectMaps(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 correspondingStandardNameList = new ArrayList<>(); + List replaceStandardNameList = new ArrayList<>();//代替标准 + List replacedStandardNameList = new ArrayList<>();//被代替标准 + List correspondingStandardNameList = new ArrayList<>();//对应标准 for (Map map : mapList) { //对应标准处理 if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) { - correspondingStandardNameList.add((String) map.get("serial_number")); + for (String s : correspondingStandard.split(",")) { + if(s.equals((String) map.get("id"))){ + correspondingStandardNameList.add((String) map.get("serial_number")); + }else{ + 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{ + replaceStandardNameList.add(s); + } + } + } + + //被代替标准 String replaceStandard = (String) map.get("replace_standard"); if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) { String serialNumber = (String) map.get("serial_number"); - replaceStandardNameList.add(serialNumber); + replacedStandardNameList.add(serialNumber); } } //对应标准中文 @@ -375,24 +395,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 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); - } - } +// 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); +// } +// } if (StringUtils.isNotBlank((String) dataList.get(0).get("technology_territory"))) { String technologyTerritory = (String) dataList.get(0).get("technology_territory"); dataList.get(0).put("technology_territory", Arrays.asList(technologyTerritory.split(",")));