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 { + 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 @@ + + + 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; + \ 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