From 8f418a582980ac9229261c11da911ece5896d883 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 10 May 2022 15:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?(=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BussDocumentLibraryEOMapper.java   |  2 +
 .../xml/BussDocumentLibraryEOMapper.xml       | 11 +++
 .../BussDocumentLibraryEOServiceImpl.java     | 77 +++++++++----------
 3 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java
index 686a085e3..d3c4b8205 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java
@@ -85,6 +85,8 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper<BussDocumentLibr
 
     List<Map<String,Object>> selectMapsAll(@Param("ids") String ids);
 
+    List<Map<String,Object>> selectMapsAllBySerialNumber(@Param("serialNumberList") String serialNumberList);
+
     List<Map<String,Object>> getListInfo(@Param("condition") String condition);
 
     List<Map<String,Object>> selectMapsByDeleteIds(@Param("id") String id);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
index 60f5ed897..a8e9f7dbe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml
@@ -78,6 +78,17 @@
         </if>
     </select>
 
+    <select id="selectMapsAllBySerialNumber" resultType="java.util.LinkedHashMap">
+        select * from buss_document_library
+        where 1=1
+        <if test="serialNumberList != null" >
+            and serial_number in
+            <foreach collection="serialNumberList.split(',')" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
     <select id="getListInfo" resultType="java.util.LinkedHashMap">
         select * from buss_document_library
         where ${condition}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 103b7c6f2..7e571f7b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1102,12 +1102,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         } catch (Exception e) {
             throw new JeroBootException(e.getMessage());
         }
-//        if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
-//            map.put("replace_standard", map.get("replace_standard_id"));
-//        }
-//        if (ObjectUtils.isNotEmpty(map.get("corresponding_standard_id"))) {
-//            map.put("corresponding_standard", map.get("corresponding_standard_id"));
-//        }
 
         //字段属性
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
@@ -1133,29 +1127,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             }
         }
         //标准选择字段
-        List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
-                .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
-        if(standardOnlCgformFieldList.size() != 0){
-            List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
-            List<String> standardList = new ArrayList<>();
-            for (Map.Entry<String, Object> entry : map.entrySet()) {
-                String key = entry.getKey();
-                if(collect.contains(key)){
-                    standardList.add(key);
-                }
-            }
-            if(standardList.size() != 0){
-                for (String standard : standardList) {
-                    map.put(standard, map.get(standard+"_id"));
-                    map.remove(standard+"_id");
-                }
-            }
-        }
+//        List<OnlCgformField> standardOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+//        if(standardOnlCgformFieldList.size() != 0){
+//            List<String> collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//            List<String> standardList = new ArrayList<>();
+//            for (Map.Entry<String, Object> entry : map.entrySet()) {
+//                String key = entry.getKey();
+//                if(collect.contains(key)){
+//                    standardList.add(key);
+//                }
+//            }
+//            if(standardList.size() != 0){
+//                for (String standard : standardList) {
+//                    map.put(standard, map.get(standard+"_id"));
+//                    map.remove(standard+"_id");
+//                }
+//            }
+//        }
         //代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态
         String cut = (String) map.get("cut");
         map.remove("cut");
-//        map.remove("replace_standard_id");
-//        map.remove("corresponding_standard_id");
         //获取搜索中心字段
         List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
         //文件类型字段
@@ -1538,19 +1530,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                             }
                         } else {
                             //对应标准,代替标准
-                            for (String valueTemp : entry.getValue().toString().split(",")) {
-                                if (isId(valueTemp)) {
-                                    //是id
-                                    for (Map<String, Object> stringObjectMap : mapList) {
-                                        if (stringObjectMap.get("id").equals(valueTemp)) {
-                                            standSb.append(stringObjectMap.get("serial_number") + ",");
-                                        }
-                                    }
-                                } else {
-                                    //不是id
-                                    standSb.append(valueTemp + ",");
-                                }
-                            }
+                            standSb.append(entry.getValue().toString() + ",");
+//                            for (String valueTemp : entry.getValue().toString().split(",")) {
+//                                if (isId(valueTemp)) {
+//                                    //是id
+//                                    for (Map<String, Object> stringObjectMap : mapList) {
+//                                        if (stringObjectMap.get("id").equals(valueTemp)) {
+//                                            standSb.append(stringObjectMap.get("serial_number") + ",");
+//                                        }
+//                                    }
+//                                } else {
+//                                    //不是id
+//                                    standSb.append(valueTemp + ",");
+//                                }
+//                            }
                         }
 
                         if (StringUtils.isNotBlank(standSb)) {
@@ -2371,8 +2364,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         webSocket.sendMessage(obj.toJSONString());
     }
 
-    private void replaceStandardSend(List<String> documentIdList) {
-        List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(documentIdList, ","));
+    private void replaceStandardSend(List<String> serialNumberListTemp) {
+        List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAllBySerialNumber(StringUtils.join(serialNumberListTemp, ","));
         List<String> userNameListTemp = new ArrayList<>();
         List<String> serialNumberList = new ArrayList<>();
         List<String> urlList = new ArrayList<>();
@@ -2403,7 +2396,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-        sendWebsocket(StringUtils.join(documentIdList, ","), StringUtils.join(documentIdList, ","));
+        sendWebsocket(StringUtils.join(serialNumberListTemp, ","), StringUtils.join(serialNumberListTemp, ","));
         //飞书
         try {
             for (String s : urlList) {