From b59cd10accc3846556e98797bf307a108f89d6fd Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 28 Jun 2023 18:44:18 +0300 Subject: [PATCH] =?UTF-8?q?SDF57=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D1=81?= =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=BE=D0=B2=20c=5Facc=5Fdeb/c=5Facc=5Fcred?= =?UTF-8?q?=20->=20acc=5Fdeb/acc=5Fkr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/validation/Sdf57ValidationRule.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf57ValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf57ValidationRule.java index cbb0a4c86..8dd350922 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf57ValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf57ValidationRule.java @@ -46,18 +46,18 @@ public enum Sdf57ValidationRule implements IValidationRule accountDebFound = Optional.empty(); Optional accountCredFound = Optional.empty(); - if (!TextUtil.isEmpty(sdf57.getC_acc_deb())) { - accountDebFound = Optional.ofNullable(accountImdg.getSingleObjectBySQL("account = '" + sdf57.getC_acc_deb() + "'")); + if (!TextUtil.isEmpty(sdf57.getAcc_deb())) { + accountDebFound = Optional.ofNullable(accountImdg.getSingleObjectBySQL("account = '" + sdf57.getAcc_deb() + "'")); accountDebFound.ifPresent(accountDeb -> context.storeObject(ValidationStored.Sdf57AccountDeb, accountDeb)); } - if (!TextUtil.isEmpty(sdf57.getC_acc_cred())) { - accountCredFound = Optional.ofNullable(accountImdg.getSingleObjectBySQL("account = '" + sdf57.getC_acc_cred() + "'")); + if (!TextUtil.isEmpty(sdf57.getAcc_kr())) { + accountCredFound = Optional.ofNullable(accountImdg.getSingleObjectBySQL("account = '" + sdf57.getAcc_kr() + "'")); accountCredFound.ifPresent(accountCred -> context.storeObject(ValidationStored.Sdf57AccountCred, accountCred)); } if (accountDebFound.isEmpty() && accountCredFound.isEmpty()) { return of(ClearingError.AccountNotPresent, String.format("accDeb = '%s'/ accCred = '%s'", - sdf57.getC_acc_deb(), sdf57.getC_acc_cred())); + sdf57.getAcc_deb(), sdf57.getAcc_kr())); } return empty(); }