Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, See merge request LiuChao/foton-slrs-system-rest!398
This commit is contained in:
+3
@@ -210,6 +210,9 @@ public class SarBussionessStand extends BaseEntity {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
|
private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Map<String, Object> attrInfoProcessMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String sarStandAttrEOStr; //新增修改时属性表信息
|
private String sarStandAttrEOStr; //新增修改时属性表信息
|
||||||
|
|
||||||
|
|||||||
+9
@@ -1105,6 +1105,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
|
|||||||
value = sysInfoEOService.getRoleNamesByIds(value);
|
value = sysInfoEOService.getRoleNamesByIds(value);
|
||||||
newMap.put(name + "Name",value);
|
newMap.put(name + "Name",value);
|
||||||
}
|
}
|
||||||
|
}else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && !InitStandAttrUtil.fileFieldListBuss.isEmpty() && InitStandAttrUtil.fileFieldListBuss.contains(entry.getKey())) {
|
||||||
|
String value = entry.getValue().toString();
|
||||||
|
if (StringUtils.isNotBlank(value)) {
|
||||||
|
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
|
||||||
|
if(!fileObj.isEmpty()){
|
||||||
|
String oldFileName = fileObj.stream().map(AttFileEO::getOldFileName).collect(Collectors.joining(","));
|
||||||
|
newMap.put(name + "Name", oldFileName);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
getAttrMap.putAll(newMap);
|
getAttrMap.putAll(newMap);
|
||||||
|
|||||||
Reference in New Issue
Block a user