From 2510597f0153df794bf7e2caa23b9d6fcac0008a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 29 Dec 2023 17:12:52 +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=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=20=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OldSystemServiceImpl.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 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 a4edbccf..e72b0627 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 @@ -283,8 +283,8 @@ public class OldSystemServiceImpl implements OldSystemService { // 代替标准号 // 先删除已经存储的关联 String standardNumber = dbData.getStandardNumber(); + lawsReplacedStandardService.removeRelation(standardNumber, 1); if (StringUtils.isNotBlank(tdbzh)) { - lawsReplacedStandardService.removeRelation(standardNumber, 1); lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1); } // 被代替标准号 @@ -297,7 +297,7 @@ public class OldSystemServiceImpl implements OldSystemService { } LambdaUpdateWrapper fbWrapper = new LambdaUpdateWrapper<>(); fbWrapper.eq(LawsOverseasStandard::getId, dbData.getId()); - fbWrapper.set(LawsOverseasStandard::getStandardState, dbData.getStandardState()); + fbWrapper.set(LawsOverseasStandard::getStandardState, fb.getStandardState()); overseasStandardService.update(fbWrapper); } @@ -356,8 +356,8 @@ public class OldSystemServiceImpl implements OldSystemService { // 代替标准号 // 先删除已经存储的关联 String standardNumber = dbData.getStandardNumber(); + lawsReplacedStandardService.removeRelation(standardNumber, 1); if (StringUtils.isNotBlank(tdbzh)) { - lawsReplacedStandardService.removeRelation(standardNumber, 1); lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1); } // 被代替标准号 @@ -370,7 +370,7 @@ public class OldSystemServiceImpl implements OldSystemService { } LambdaUpdateWrapper gbWrapper = new LambdaUpdateWrapper<>(); gbWrapper.eq(LawsDomesticStandard::getId, dbData.getId()); - gbWrapper.set(LawsDomesticStandard::getStandardState, dbData.getStandardState()); + gbWrapper.set(LawsDomesticStandard::getStandardState, gb.getStandardState()); domesticStandardService.update(gbWrapper); } @@ -405,7 +405,20 @@ public class OldSystemServiceImpl implements OldSystemService { es.setStandardNumber(dto.getBzh()); es.setStandardName(dto.getBzmc()); String standardState = dto.getBzzt(); - es.setStandardState(standardState.equals("现行有效") ? "8" : "9"); + switch (standardState) { + case "现行有效": + es.setStandardState("8"); + break; + case "作废": + es.setStandardState("9"); + break; + case "封存": + es.setStandardState("A"); + break; + case "预发布": + es.setStandardState("5"); + break; + } es.setSubstituteStandardNumber(tdbzh); es.setReplacedByStandardNumber(btdbzh); esList.add(es); @@ -421,8 +434,8 @@ public class OldSystemServiceImpl implements OldSystemService { // 代替标准号 // 先删除已经存储的关联 String standardNumber = dbData.getStandardNumber(); + lawsReplacedStandardService.removeRelation(standardNumber, 1); if (StringUtils.isNotBlank(tdbzh)) { - lawsReplacedStandardService.removeRelation(standardNumber, 1); lawsReplacedStandardService.addRelationOldSystemSync(tdbzh, standardNumber, 1); } // 被代替标准号 @@ -435,7 +448,7 @@ public class OldSystemServiceImpl implements OldSystemService { } LambdaUpdateWrapper esWrapper = new LambdaUpdateWrapper<>(); esWrapper.eq(LawsEnterpriseStandard::getId, dbData.getId()); - esWrapper.set(LawsEnterpriseStandard::getStandardState, dbData.getStandardState()); + esWrapper.set(LawsEnterpriseStandard::getStandardState, es.getStandardState()); esService.update(esWrapper); } // 获取当前时间戳（毫秒）