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 fc4ad7d23..5200fe0eb 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 @@ -341,23 +341,68 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getInfoById(String id, String cut) { - //处理被代替标准 - //根据代替标准查询被代替标准集合 - List> replaceStandardList = bussDocumentLibraryEOMapper.getInfoListByReplaceStandard(id); - List replaceStandardNameList = new ArrayList<>(); - for (Map map : replaceStandardList) { - String serialNumber = (String) map.get("serial_number"); - replaceStandardNameList.add(serialNumber); - } - //区域管理 - List areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea()); - //字段属性 - List fieldList = onlCgformFieldService.getFieldList("1"); - //通过id查询数据 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BussDocumentLibraryEO::getId, id); List> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); + //查询所有 + List> mapList = bussDocumentLibraryEOMapper.selectMaps(null); + + //原始对应标准,代替标准,被代替标准(原始数据存的是iD) + String correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准 + String replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准 + //被代替标准 + List replacedStandardIdList = new ArrayList<>();//代替标准 + + //对应标准,代替标准,被代替标准对应的编码 + List correspondingStandardNameList = new ArrayList<>();//对应标准编码 + List replaceStandardNameList = new ArrayList<>();//代替标准编码 + List replacedStandardNameList = new ArrayList<>();//被代替标准编码 + + List> listCorrespondingStandard = new ArrayList<>(); + List> listReplaceStandard = new ArrayList<>(); + List> listReplacedStandard = new ArrayList<>(); + + + //处理被代替标准和对应标准 + for (Map map : mapList) { + Map mapTemp = new HashMap<>(); + //对应标准处理 + if (StringUtils.isNotBlank(correspondingStandardId) && correspondingStandardId.contains((String) map.get("id"))) { + correspondingStandardNameList.add((String) map.get("serial_number")); + mapTemp.put("title",(String) map.get("serial_number")); + mapTemp.put("id",(String) map.get("id")); + if(ObjectUtils.isNotEmpty(mapTemp)){ + listCorrespondingStandard.add(mapTemp); + } + } + //代替标准 + if(StringUtils.isNotBlank(replaceStandardId) && replaceStandardId.contains((String) map.get("id"))){ + replaceStandardNameList.add((String) map.get("serial_number")); + mapTemp.put("title",(String) map.get("serial_number")); + mapTemp.put("id",(String) map.get("id")); + if(ObjectUtils.isNotEmpty(mapTemp)){ + listReplaceStandard.add(mapTemp); + } + } + //被代替标准 + String replaceStandard = (String) map.get("replace_standard"); + if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) { + replacedStandardIdList.add((String) map.get("id")); + String serialNumber = (String) map.get("serial_number"); + replacedStandardNameList.add(serialNumber); + mapTemp.put("title",(String) map.get("serial_number")); + mapTemp.put("id",(String) map.get("id")); + if(ObjectUtils.isNotEmpty(mapTemp)){ + listReplacedStandard.add(mapTemp); + } + } + } + + //区域管理 + List areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea()); + //字段属性 + List fieldList = onlCgformFieldService.getFieldList("1"); //过滤出下拉选 List onlCgformFieldList = fieldList.stream() @@ -428,9 +473,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { if (onlCgformField.getDbFieldName().equals(entry.getKey())) { - if (onlCgformField.getDbFieldName().equals("replaced_standard")) { + if (onlCgformField.getDbFieldName().equals("replace_standard")) { + //代替标准 map.put("value", StringUtils.join(replaceStandardNameList, ",")); - } else { + map.put("list",listReplaceStandard); + } else if(onlCgformField.getDbFieldName().equals("replaced_standard")){ + //被代替标准 + map.put("value", StringUtils.join(replacedStandardNameList, ",")); + map.put("list",listReplacedStandard); + }else if(onlCgformField.getDbFieldName().equals("corresponding_standard")){ + //对应标准 + map.put("value", StringUtils.join(correspondingStandardNameList, ",")); + map.put("list",listCorrespondingStandard); + }else { map.put("value", entry.getValue()); } }