WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-认证类别参数项查询修改

Browse Source
This commit is contained in:
liyawei
2022-04-26 14:29:51 +08:00
parent dae12f618f
commit 94e7b8952f
2 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
+2 -2
View File
@@ -90,11 +90,11 @@ public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl<CertCategor
@Override @Override
public List<CertCategoryParamsInfoEO> selectListByNioNumber(String nioNumber) { public List<CertCategoryParamsInfoEO> selectListByNioNumber(String nioNumber) {
return selectListByNioNumber(nioNumber); return baseMapper.selectListByNioNumber(nioNumber);
} }
@Override @Override
public int deleteByNioNumberList(List<String> nioNumberList) { public int deleteByNioNumberList(List<String> nioNumberList) {
return deleteByNioNumberList(nioNumberList); return baseMapper.deleteByNioNumberList(nioNumberList);
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+67 -23
View File
@@ -541,8 +541,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
if (CollectionUtil.isNotEmpty(sysUserList)) { if (CollectionUtil.isNotEmpty(sysUserList)) {
for (SysUser user : sysUserList) { for (SysUser user : sysUserList) {
stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),"); // stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),");
// stringBuilder.append(user.getUsername()).append(","); stringBuilder.append(user.getUsername()).append(",");
} }
String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
entry.setValue(value); entry.setValue(value);
@@ -550,9 +550,28 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
// 标准选择 // 标准选择
if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) {
if (entry.getValue().toString().split(",").length > 0) {
List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString()); List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString());
if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ Map<String, String> idSerialNumberMap = new HashMap<>();
String value = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); List<String> idList = new ArrayList<>();
for (Map<String, Object> map : documentLibraryEOList) {
String serialNumber = (String) map.get("serial_number");
String id = (String) map.get("id");
idSerialNumberMap.put(id, serialNumber);
idList.add(id);
}
List<String> valueList = Arrays.asList(entry.getValue().toString().split(","));
List<String> newValueList = new ArrayList<>();
for(String value : valueList) {
if (idList.contains(value)) {
newValueList.add(idSerialNumberMap.get(value));
} else {
newValueList.add(value);
}
}
String value = StringUtils.join(newValueList, ",");
entry.setValue(value); entry.setValue(value);
} }
} }
@@ -885,12 +904,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) { if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(","))); List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")));
if(CollectionUtil.isNotEmpty(sysUserList)){ if(CollectionUtil.isNotEmpty(sysUserList)){
List<String> realNames = sysUserList.stream().map(SysUser :: getRealname).collect(Collectors.toList()); // List<String> realNames = sysUserList.stream().map(SysUser :: getRealname).collect(Collectors.toList());
List<String> userNames = sysUserList.stream().map(SysUser :: getUsername).collect(Collectors.toList()); List<String> userNames = sysUserList.stream().map(SysUser :: getUsername).collect(Collectors.toList());
List<String> names = new ArrayList<>(); List<String> names = new ArrayList<>();
for(int i=0; i<realNames.size(); i++){ for(int i=0; i<userNames.size(); i++){
String name = realNames.get(i) + "(" + userNames.get(i) + ")"; // String name = realNames.get(i) + "(" + userNames.get(i) + ")";
// String name = userNames.get(i); String name = userNames.get(i);
names.add(name); names.add(name);
} }
itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString()); itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
@@ -902,13 +921,38 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
// 标准选择 // 标准选择
if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) { if (FieldTypeEnum.STANDARD.getValue().equals(fieldType)) {
if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) { if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
if (itemsMap.get(dbFieldName).toString().split(",").length > 0) {
List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString()); List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ Map<String, String> idSerialNumberMap = new HashMap<>();
String names = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); List<String> idList = new ArrayList<>();
for (Map<String, Object> map : documentLibraryEOList) {
String serialNumber = (String) map.get("serial_number");
String documentLibraryEOId = (String) map.get("id");
idSerialNumberMap.put(documentLibraryEOId, serialNumber);
idList.add(documentLibraryEOId);
}
List<String> valueList = Arrays.asList(itemsMap.get(dbFieldName).toString().split(","));
List<String> newValueList = new ArrayList<>();
for(String value : valueList) {
if (idList.contains(value)) {
newValueList.add(idSerialNumberMap.get(value));
} else {
newValueList.add(value);
}
}
String names = StringUtils.join(newValueList, ",");
itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString()); itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
itemsMap.put(dbFieldName, names); itemsMap.put(dbFieldName, names);
} }
// List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
// if(CollectionUtil.isNotEmpty(documentLibraryEOList)){
// String names = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),",");
// itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString());
// itemsMap.put(dbFieldName, names);
//
// }
} }
} }
} }
@@ -2251,22 +2295,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
countError++; countError++;
} }
String regexPerson = "^[\\u4e00-\\u9fa5A-Za-z0-9]{0,}\\([A-Za-z0-9.]*\\)$"; // String regexPerson = "^[\\u4e00-\\u9fa5A-Za-z0-9]{0,}\\([A-Za-z0-9.]*\\)$";
value = value.replace("，",","); value = value.replace("，",",");
if(StringUtils.isNotBlank(value)) { if(StringUtils.isNotBlank(value)) {
String[] userNames = value.split(","); String[] userNames = value.split(",");
List<String> userIdList = new ArrayList<>(); List<String> userIdList = new ArrayList<>();
for(int u=0 ; u<userNames.length; u++){ for(int u=0 ; u<userNames.length; u++){
if(!userNames[u].matches(regexPerson)) { // if(!userNames[u].matches(regexPerson)) {
if(CutEnum.CN.getValue().equals(cut)) { // if(CutEnum.CN.getValue().equals(cut)) {
errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；"; // errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；";
} else { // } else {
errorMsg += fieldName + "Not in the correct format, fill in the format:name(account);"; // errorMsg += fieldName + "Not in the correct format, fill in the format:name(account);";
} // }
countError++; // countError++;
}else { // }else {
String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")")); // String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")"));
// String uName = userNames[u]; String uName = userNames[u];
SysUser user = sysUserService.getUserByName(uName); SysUser user = sysUserService.getUserByName(uName);
if (ObjectUtils.isNotEmpty(user)) { if (ObjectUtils.isNotEmpty(user)) {
userIdList.add(user.getId()); userIdList.add(user.getId());
@@ -2278,7 +2322,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
countError++; countError++;
} }
} // }
} }
value = StringUtils.join(userIdList, ","); value = StringUtils.join(userIdList, ",");
} }