文档库--编辑时回显数据中对应标准和代替标准展示
This commit is contained in:
+56
-4
@@ -391,7 +391,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
queryWrapper.eq(BussDocumentLibraryEO::getId, id);
|
||||
//通过id查询数据
|
||||
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
|
||||
;
|
||||
//查询所有
|
||||
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
|
||||
//对应标准id
|
||||
@@ -409,7 +408,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
if (s.equals((String) map.get("id"))) {
|
||||
correspondingStandardNameList.add((String) map.get("serial_number"));
|
||||
} else {
|
||||
correspondingStandardNameList.add(s);
|
||||
boolean flag = isId(s);
|
||||
if(!flag && !correspondingStandardNameList.contains(s)){
|
||||
correspondingStandardNameList.add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
//处理已删除的文档的对应标准
|
||||
if(StringUtils.isNotBlank(correspondingStandard)){
|
||||
for (String s : correspondingStandard.split(",")) {
|
||||
boolean flag = isId(s);
|
||||
if(!flag && !correspondingStandardNameList.contains(s)){
|
||||
correspondingStandardNameList.add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -419,11 +431,24 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
if (s.equals((String) map.get("id"))) {
|
||||
replaceStandardNameList.add((String) map.get("serial_number"));
|
||||
} else {
|
||||
replaceStandardNameList.add(s);
|
||||
boolean flag = isId(s);
|
||||
if(!flag && !replaceStandardNameList.contains(s)){
|
||||
replaceStandardNameList.add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
//处理已删除的代替标准
|
||||
if(StringUtils.isNotBlank(replaceStandardTemp)){
|
||||
for (String s : replaceStandardTemp.split(",")) {
|
||||
boolean flag = isId(s);
|
||||
if(!flag && !replaceStandardNameList.contains(s)){
|
||||
replaceStandardNameList.add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//被代替标准
|
||||
String replaceStandard = (String) map.get("replace_standard");
|
||||
if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
|
||||
@@ -2895,4 +2920,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
|
||||
return bussDocumentLibraryEOMapper.getListBySerialNumber(serialNumbers);
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证字符串是不是id
|
||||
* @param s
|
||||
* @return
|
||||
*/
|
||||
public boolean isId(String s){
|
||||
if(StringUtils.isBlank(s)){
|
||||
return false;
|
||||
}
|
||||
if(s.length() ==32){
|
||||
String sub1 = s.substring(0, 8);
|
||||
String sub2 = s.substring(8, 12);
|
||||
String sub3 = s.substring(12, 16);
|
||||
String sub4 = s.substring(16, 20);
|
||||
String sub5 = s.substring(20, 32);
|
||||
String id = sub1 + "-" + sub2 + "-" + sub3 + "-" + sub4 + "-" + sub5;
|
||||
try {
|
||||
UUID uuid = UUID.fromString(id);
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user