From e88e634467462af10460abcc340134c64552abdb Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 2 Jan 2024 15:30:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=80=81=E6=B3=95=E8=A7=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E8=A2=AB=E4=BB=A3=E6=9B=BF=E8=A1=A8=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8E=BB=E9=87=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oldSystem/service/impl/OldSystemServiceImpl.java     | 2 ++
 .../laws/standard/mapper/LawsReplacedStandardMapper.java | 1 +
 .../standard/mapper/xml/LawsReplacedStandardMapper.xml   | 9 +++++++++
 .../standard/service/ILawsReplacedStandardService.java   | 5 +++++
 .../service/impl/LawsReplacedStandardServiceImpl.java    | 9 +++++++++
 5 files changed, 26 insertions(+)

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 df2ebedc..26d51cc0 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
@@ -236,6 +236,8 @@ public class OldSystemServiceImpl implements OldSystemService {
                 this.oldSysFBDataFix(allDatalist, errImportList);
 
         }
+        // 统一清理代替被代替重复数据
+        lawsReplacedStandardService.clearRepeatData();
         if (!errImportList.isEmpty()) {
             this.exportWithExcel(response, errImportList, "OldSystemStandardErrorData.xls");
         }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsReplacedStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsReplacedStandardMapper.java
index ed024716..ea0b4dd1 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsReplacedStandardMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/LawsReplacedStandardMapper.java
@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LawsReplacedStandardMapper extends BaseMapper<LawsReplacedStandard> {
 
+    void clearRepeatData();
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsReplacedStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsReplacedStandardMapper.xml
index 1b5d09a3..cd7b8947 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsReplacedStandardMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsReplacedStandardMapper.xml
@@ -7,4 +7,13 @@
         <result column="replaced_by" property="replacedBy" />
         <result column="type" property="type" />
     </resultMap>
+
+    <delete id="clearRepeatData">
+        DELETE t1 FROM laws_replaced_standard t1
+                           INNER JOIN laws_replaced_standard t2
+        WHERE
+            t1.id > t2.id AND
+            t1.replaced = t2.replaced AND
+            t1.replaced_by = t2.replaced_by;
+    </delete>
 </mapper>
\ No newline at end of file
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 a8eff688..9245faa8 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
@@ -46,4 +46,9 @@ public interface ILawsReplacedStandardService extends IService<LawsReplacedStand
 	 **/
 	String getReplacedBy(String standardNumber, Integer type);
 
+	/**
+	 * 清理重复数据
+	 */
+	void clearRepeatData();
+
 }
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 65c0d50a..d8061470 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
@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -32,6 +33,9 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
     @Autowired
     private ILawsCommonService lawsCommonService;
 
+    @Resource
+    private LawsReplacedStandardMapper replacedStandardMapper;
+
     /**
      * @Author: liao
      * @Date: 2023/9/19 11:06
@@ -130,4 +134,9 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
                 .map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toList());
         return StringUtils.join(replacedByList, ",");
     }
+
+    @Override
+    public void clearRepeatData() {
+        replacedStandardMapper.clearRepeatData();
+    }
 }