From 54b209a5ab9506ad3e40d34d16bf7d51f1cea643 Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 23 Aug 2023 14:04:31 +0300 Subject: [PATCH] =?UTF-8?q?swt-importer=20sdf21=20=D1=83=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BD=D0=B0=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=B3=D1=80=D1=83=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swt/importer/logic/data/tables/SDf21Table.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/tables/SDf21Table.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/tables/SDf21Table.java index 088193327..cb8038b50 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/tables/SDf21Table.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/tables/SDf21Table.java @@ -6,6 +6,8 @@ import ru.clearing.classes.statics.data.sdf.SDf21; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.swt.importer.logic.data.enums.ETable; import ru.spcex.clearing.swt.importer.readers.SWTRecord; +import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; +import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import java.time.Instant; @@ -48,7 +50,14 @@ public class SDf21Table extends AbstractTable { if (map == null) { bootMap(); } - SDf21 firstObjectBySQL = map.getFirstObjectBySQL("transactionNumber = '%s'".formatted(obj.getTransactionNumber())); + ImdgPredicateBuilder pb = map.predicateBuilder(); + ImdgPredicate sameTransactionNumberAndOperationCode = pb.and( + pb.equals("transactionNumber", obj.getTransactionNumber()), + pb.equals("operationCode", obj.getOperationCode()) + ); + SDf21 firstObjectBySQL = map.getFirstObjectByPredicate( + sameTransactionNumberAndOperationCode + ); if (firstObjectBySQL != null) { log.warn("Skip insert by {}, sdf21.transactionNumber: {}", PREFIX, obj.getTransactionNumber()); } else {