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 replaceCodeList = Arrays.asList(btdbzh.split(";")); + List 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 replaceCodeList = Arrays.asList(btdbzh.split(";")); + List 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 replaceCodeList = Arrays.asList(btdbzh.split(";")); + List 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 replacedList = Arrays.asList(replaced.split(",")); + List 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