From 05c8d317822bece00752792a2429472a1f82ccc5 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 29 Dec 2023 14:22:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=80=81=E6=B3=95=E8=A7=84=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5-=E6=A0=87=E5=87=86=E5=8F=B7=E4=BB=A3=E6=9B=BF?=
 =?UTF-8?q?=E8=A2=AB=E4=BB=A3=E6=9B=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OldSystemServiceImpl.java    | 30 +++++++++++++------
 .../service/ILawsReplacedStandardService.java |  7 +++++
 .../impl/LawsReplacedStandardServiceImpl.java | 19 ++++++++++++
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
index 278f8212..3c392537 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java
@@ -382,14 +382,18 @@ public class OldSystemServiceImpl implements OldSystemService {
             String tdbzh = entity.getSubstituteStandardNumber();
             String btdbzh = entity.getReplacedByStandardNumber();
             // 代替标准号
+            // 先删除已经存储的关联
+            String standardNumber = entity.getStandardNumber();
             if (StringUtils.isNotBlank(tdbzh)) {
-                lawsReplacedStandardService.addRelation(btdbzh, tdbzh, 1);
+                lawsReplacedStandardService.removeRelation(standardNumber, 1);
+                lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1);
             }
             // 被代替标准号
             if (StringUtils.isNotBlank(btdbzh)) {
-                List<String> replaceCodeList = Arrays.asList(btdbzh.split(";"));
+                List<String> replaceCodeList = Arrays.asList(btdbzh.split(","));
                 replaceCodeList.forEach(replaceCode -> {
-                    lawsReplacedStandardService.addRelation(replaceCode, btdbzh, 1);
+                    lawsReplacedStandardService.removeRelation(replaceCode, 1);
+                    lawsReplacedStandardService.addRelationOldSystemSync(standardNumber, replaceCode, 1);
                 });
             }
             entity.setSubstituteStandardNumber(null);
@@ -1319,14 +1323,18 @@ public class OldSystemServiceImpl implements OldSystemService {
             String tdbzh = entity.getSubstituteStandardNumber();
             String btdbzh = entity.getReplacedByStandardNumber();
             // 代替标准号
+            // 先删除已经存储的关联
+            String standardNumber = entity.getStandardNumber();
             if (StringUtils.isNotBlank(tdbzh)) {
-                lawsReplacedStandardService.addRelation(btdbzh, tdbzh, 1);
+                lawsReplacedStandardService.removeRelation(standardNumber, 1);
+                lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1);
             }
             // 被代替标准号
             if (StringUtils.isNotBlank(btdbzh)) {
-                List<String> replaceCodeList = Arrays.asList(btdbzh.split(";"));
+                List<String> replaceCodeList = Arrays.asList(btdbzh.split(","));
                 replaceCodeList.forEach(replaceCode -> {
-                    lawsReplacedStandardService.addRelation(replaceCode, btdbzh, 1);
+                    lawsReplacedStandardService.removeRelation(replaceCode, 1);
+                    lawsReplacedStandardService.addRelationOldSystemSync(standardNumber, replaceCode, 1);
                 });
             }
             entity.setSubstituteStandardNumber(null);
@@ -1526,14 +1534,18 @@ public class OldSystemServiceImpl implements OldSystemService {
             String tdbzh = entity.getSubstituteStandardNumber();
             String btdbzh = entity.getReplacedByStandardNumber();
             // 代替标准号
+            // 先删除已经存储的关联
+            String standardNumber = entity.getStandardNumber();
             if (StringUtils.isNotBlank(tdbzh)) {
-                lawsReplacedStandardService.addRelation(tdbzh, curStandardNumber, 1);
+                lawsReplacedStandardService.removeRelation(standardNumber, 1);
+                lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1);
             }
             // 被代替标准号
             if (StringUtils.isNotBlank(btdbzh)) {
-                List<String> replaceCodeList = Arrays.asList(btdbzh.split(";"));
+                List<String> replaceCodeList = Arrays.asList(btdbzh.split(","));
                 replaceCodeList.forEach(replaceCode -> {
-                    lawsReplacedStandardService.addRelation(curStandardNumber, replaceCode, 1);
+                    lawsReplacedStandardService.removeRelation(replaceCode, 1);
+                    lawsReplacedStandardService.addRelationOldSystemSync(standardNumber, replaceCode, 1);
                 });
             }
             entity.setSubstituteStandardNumber(null);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java
index 463ccb6e..a8eff688 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsReplacedStandardService.java
@@ -18,6 +18,13 @@ public interface ILawsReplacedStandardService extends IService<LawsReplacedStand
 	 **/
 	void addRelation(String replaced, String replacedBy, Integer type);
 
+	/**
+	 * @Author: liao
+	 * @Date: 2023/9/19 11:03
+	 * @Description: 添加代替标准关联（老法规导入专用）
+	 **/
+	void addRelationOldSystemSync(String replaced, String replacedBy, Integer type);
+
 	/**
 	 * @Author: liao
 	 * @Date: 2023/9/19 11:07
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java
index 816b3a6d..65c0d50a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java
@@ -61,6 +61,25 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
         }
     }
 
+    @Override
+    public void addRelationOldSystemSync(String replaced, String replacedBy, Integer type) {
+        // 如果代替的标准为空
+        if (StringUtils.isBlank(replaced)) {
+            return;
+        }
+        // 添加新的关联
+        List<String> replacedList = Arrays.asList(replaced.split(","));
+        List<LawsReplacedStandard> replacedStandardList = new ArrayList<>();
+        replacedList.forEach(e -> {
+            LawsReplacedStandard replacedStandard = new LawsReplacedStandard();
+            replacedStandard.setReplaced(e);
+            replacedStandard.setReplacedBy(replacedBy);
+            replacedStandard.setType(type);
+            replacedStandardList.add(replacedStandard);
+        });
+        saveBatch(replacedStandardList);
+    }
+
     /**
      * @Author: liao
      * @Date: 2023/9/19 11:08