国内标准 起草部门 对应
This commit is contained in:
+23
@@ -810,6 +810,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
|||||||
String fieldInfo = InitStandAttrUtil.queryField;
|
String fieldInfo = InitStandAttrUtil.queryField;
|
||||||
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
|
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
|
||||||
row.setCollectId(collectId);
|
row.setCollectId(collectId);
|
||||||
|
List<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
|
||||||
|
Map<String, String> dicMap = dicInfo.stream()
|
||||||
|
.filter(item -> !item.getDicTypeCode().isEmpty())
|
||||||
|
.collect(Collectors.toMap(DicTypeEO::getDicTypeCode, DicTypeEO::getDicTypeName, (value1, value2) -> value2));
|
||||||
// 查询属性表数据
|
// 查询属性表数据
|
||||||
if (StringUtils.isNotBlank(fieldInfo)) {
|
if (StringUtils.isNotBlank(fieldInfo)) {
|
||||||
Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
|
Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
|
||||||
@@ -848,6 +852,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (getAttrMap != null && !getAttrMap.isEmpty()) {
|
if (getAttrMap != null && !getAttrMap.isEmpty()) {
|
||||||
|
if (null!=getAttrMap.get("QCDW")){
|
||||||
|
String qcdw= String.valueOf(getAttrMap.get("QCDW"));
|
||||||
|
if (qcdw.contains(",")){
|
||||||
|
List<String> qc=new ArrayList<>(Arrays.asList(qcdw.split(",")));
|
||||||
|
List<String> 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));
|
row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user