From 5b529484a5b769b8f5219a900f3479523ba67ab2 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 13 Jan 2023 17:21:56 +0300 Subject: [PATCH] =?UTF-8?q?balance-service=20sfd09=20=D0=BF=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=20=D0=BF=D0=BE=20inn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../balance/validation/Sdf01ValidationRule.java | 1 - .../balance/validation/Sdf09ValidationRule.java | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf01ValidationRule.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf01ValidationRule.java index c783e57d3..120cb137a 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf01ValidationRule.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf01ValidationRule.java @@ -58,7 +58,6 @@ public enum Sdf01ValidationRule implements IValidationRule validate(ImdgValidationContext context) { SDf01 sdf01 = context.getValidatedObject(); - //fixme string format??? if (!LocalDate.now().equals(LocalDate.parse(sdf01.getDat(), datFormatter))) { return of(BalanceError.CurrentDateOnly); } diff --git a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java index 5daf7d4a6..c707de1b4 100644 --- a/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java +++ b/clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java @@ -13,6 +13,7 @@ import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.validation.IValidationRule; +import java.math.RoundingMode; import java.util.Map; import java.util.Optional; @@ -23,11 +24,14 @@ public enum Sdf09ValidationRule implements IValidationRule companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); + String innStr = sdf09.getInn().setScale(0, RoundingMode.DOWN).toString(); CompanySymbols symbol = companySymbolImdg .getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(), - "companySymbolValue", sdf09.getInn())); - Company company = companyImdg.getSingleObjectByID(symbol.getCompanyId()); - + "companySymbolValue", innStr)); + Company company = null; + if (symbol != null) { + company = companyImdg.getSingleObjectByID(symbol.getCompanyId()); + } if (company == null) { return of( BalanceError.CompanyNotFound); }