From 94e7b8952f92030f76055b45e3f6949e15d5a87b Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 26 Apr 2022 14:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E8=AE=A4=E8=AF=81=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CertCategoryParamsInfoEOServiceImpl.java  |  4 +-
 .../impl/FileSplitItemsEOServiceImpl.java     | 94 ++++++++++++++-----
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
index 679380e0d..e7729a896 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoEOServiceImpl.java
@@ -90,11 +90,11 @@ public class CertCategoryParamsInfoEOServiceImpl extends ServiceImpl<CertCategor
 
 	@Override
 	public List<CertCategoryParamsInfoEO> selectListByNioNumber(String nioNumber) {
-		return selectListByNioNumber(nioNumber);
+		return baseMapper.selectListByNioNumber(nioNumber);
 	}
 
 	@Override
 	public int deleteByNioNumberList(List<String> nioNumberList) {
-		return deleteByNioNumberList(nioNumberList);
+		return baseMapper.deleteByNioNumberList(nioNumberList);
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index a5db41d09..a06768d9a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -541,8 +541,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     StringBuilder stringBuilder = new StringBuilder();
                     if (CollectionUtil.isNotEmpty(sysUserList)) {
                         for (SysUser user : sysUserList) {
-                            stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),");
-//                            stringBuilder.append(user.getUsername()).append(",");
+//                            stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),");
+                            stringBuilder.append(user.getUsername()).append(",");
                         }
                         String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(","));
                         entry.setValue(value);
@@ -550,9 +550,28 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 }
                 // 标准选择
                 if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) {
-                    List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString());
-                    if(CollectionUtil.isNotEmpty(documentLibraryEOList)){
-                        String value = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),",");
+                    if (entry.getValue().toString().split(",").length > 0) {
+                        List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString());
+                        Map<String, String> idSerialNumberMap = new HashMap<>();
+                        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);
                     }
                 }
@@ -885,12 +904,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 if (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
                     List<SysUser> sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(",")));
                     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> names = new ArrayList<>();
-                        for(int i=0; i<realNames.size(); i++){
-                            String name = realNames.get(i) + "(" + userNames.get(i) + ")";
-//                            String name = userNames.get(i);
+                        for(int i=0; i<userNames.size(); i++){
+//                            String name = realNames.get(i) + "(" + userNames.get(i) + ")";
+                            String name = userNames.get(i);
                             names.add(name);
                         }
                         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 (StringUtils.isNotBlank((String)itemsMap.get(dbFieldName))) {
-                    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()),",");
+                    if (itemsMap.get(dbFieldName).toString().split(",").length > 0) {
+                        List<Map<String, Object>> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString());
+                        Map<String, String> idSerialNumberMap = new HashMap<>();
+                        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, 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++;
                             }
-                            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("，",",");
                             if(StringUtils.isNotBlank(value)) {
                                 String[] userNames = value.split(",");
                                 List<String> userIdList = new ArrayList<>();
                                 for(int u=0 ; u<userNames.length; u++){
-                                    if(!userNames[u].matches(regexPerson)) {
-                                        if(CutEnum.CN.getValue().equals(cut)) {
-                                            errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；";
-                                        } else {
-                                            errorMsg += fieldName + "Not in the correct format, fill in the format:name(account);";
-                                        }
-                                        countError++;
-                                    }else {
-                                        String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")"));
-//                                        String uName = userNames[u];
+//                                    if(!userNames[u].matches(regexPerson)) {
+//                                        if(CutEnum.CN.getValue().equals(cut)) {
+//                                            errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；";
+//                                        } else {
+//                                            errorMsg += fieldName + "Not in the correct format, fill in the format:name(account);";
+//                                        }
+//                                        countError++;
+//                                    }else {
+//                                        String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")"));
+                                        String uName = userNames[u];
                                         SysUser user = sysUserService.getUserByName(uName);
                                         if (ObjectUtils.isNotEmpty(user)) {
                                             userIdList.add(user.getId());
@@ -2278,7 +2322,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             }
                                             countError++;
                                         }
-                                    }
+//                                    }
                                 }
                                 value = StringUtils.join(userIdList, ",");
                             }