diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index e02eeee6..f2c1a0fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -810,6 +810,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); + Map dicMap = dicInfo.stream() + .filter(item -> !item.getDicTypeCode().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeCode, DicTypeEO::getDicTypeName, (value1, value2) -> value2)); // 查询属性表数据 if (StringUtils.isNotBlank(fieldInfo)) { Map getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); @@ -848,6 +852,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl qc=new ArrayList<>(Arrays.asList(qcdw.split(","))); + List res=new ArrayList<>(); + for (String q:qc) { + if (null!=dicMap.get(q)) { + res.add(dicMap.get(q)); + }else { + res.add(q); + } + } + getAttrMap.put("QCDW",StringUtils.join(res,",")); + }else { + if (null!=dicMap.get(qcdw)) { + getAttrMap.put("QCDW", dicMap.get(qcdw)); + } + } + } row.setAttrInfoCaseMap(transformUpperCase(getAttrMap)); }