From e8cdf17da35cee45fbbb81f5c8a2c6f0e2407ddc Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 9 Mar 2022 21:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=89=8B=E8=BE=93?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 61 +++++++++++++------
 1 file changed, 42 insertions(+), 19 deletions(-)

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 fe99f20a1..534c8720b 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
@@ -355,19 +355,39 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMaps(null);
         //对应标准id
         String correspondingStandard = (String) dataList.get(0).get("corresponding_standard");
+        //代替标准id
+        String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
         //处理被代替标准和对应标准
-        List<String> replaceStandardNameList = new ArrayList<>();
-        List<String> correspondingStandardNameList = new ArrayList<>();
+        List<String> replaceStandardNameList = new ArrayList<>();//代替标准
+        List<String> replacedStandardNameList = new ArrayList<>();//被代替标准
+        List<String> correspondingStandardNameList = new ArrayList<>();//对应标准
         for (Map<String, Object> map : mapList) {
             //对应标准处理
             if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
-                correspondingStandardNameList.add((String) map.get("serial_number"));
+                for (String s : correspondingStandard.split(",")) {
+                    if(s.equals((String) map.get("id"))){
+                        correspondingStandardNameList.add((String) map.get("serial_number"));
+                    }else{
+                        correspondingStandardNameList.add(s);
+                    }
+                }
             }
             //代替标准
+            if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) {
+                for (String s : replaceStandardTemp.split(",")) {
+                    if(s.equals((String) map.get("id"))){
+                        replaceStandardNameList.add((String) map.get("serial_number"));
+                    }else{
+                        replaceStandardNameList.add(s);
+                    }
+                }
+            }
+
+            //被代替标准
             String replaceStandard = (String) map.get("replace_standard");
             if (StringUtils.isNotBlank(replaceStandard) && replaceStandard.contains(id)) {
                 String serialNumber = (String) map.get("serial_number");
-                replaceStandardNameList.add(serialNumber);
+                replacedStandardNameList.add(serialNumber);
             }
         }
         //对应标准中文
@@ -375,24 +395,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             dataList.get(0).put("corresponding_standard", StringUtils.join(correspondingStandardNameList, ","));
             dataList.get(0).put("corresponding_standard_id", correspondingStandard);
         }
+        if (replacedStandardNameList.size() != 0) {
+            dataList.get(0).put("replaced_standard", StringUtils.join(replacedStandardNameList, ","));
+        }
         if (replaceStandardNameList.size() != 0) {
-            dataList.get(0).put("replaced_standard", StringUtils.join(replaceStandardNameList, ","));
+            dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
         }
         //代替标准中文
-        String replaceStandard = (String) dataList.get(0).get("replace_standard");
-        if (StringUtils.isNotBlank(replaceStandard)) {
-            LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
-            queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
-            List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
-            if (dataListTemp.size() != 0) {
-                List<String> replaceStandardListNew = new ArrayList<>();
-                for (Map<String, Object> map : dataListTemp) {
-                    replaceStandardListNew.add((String) map.get("serial_number"));
-                }
-                dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
-                dataList.get(0).put("replace_standard_id", replaceStandard);
-            }
-        }
+//        String replaceStandard = (String) dataList.get(0).get("replace_standard");
+//        if (StringUtils.isNotBlank(replaceStandard)) {
+//            LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapperTemp = new LambdaQueryWrapper<>();
+//            queryWrapperTemp.in(BussDocumentLibraryEO::getId, Arrays.asList(replaceStandard.split(",")));
+//            List<Map<String, Object>> dataListTemp = bussDocumentLibraryEOMapper.selectMaps(queryWrapperTemp);
+//            if (dataListTemp.size() != 0) {
+//                List<String> replaceStandardListNew = new ArrayList<>();
+//                for (Map<String, Object> map : dataListTemp) {
+//                    replaceStandardListNew.add((String) map.get("serial_number"));
+//                }
+//                dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardListNew, ","));
+//                dataList.get(0).put("replace_standard_id", replaceStandard);
+//            }
+//        }
         if (StringUtils.isNotBlank((String) dataList.get(0).get("technology_territory"))) {
             String technologyTerritory = (String) dataList.get(0).get("technology_territory");
             dataList.get(0).put("technology_territory", Arrays.asList(technologyTerritory.split(",")));