From 475c3f99ac870fc474971b505674e3e395c82a6d Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 8 Aug 2023 21:43:11 +0300 Subject: [PATCH] =?UTF-8?q?SDF21=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D1=80=D0=B5=D0=B3?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=80=D0=B0=20=D0=BF=D0=BE=20securityId=20sw?= =?UTF-8?q?t-importer=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8F=2035B/83D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/service/executors/Sdf21Executor.java | 6 ++++++ .../swt/importer/logic/data/enums/ReadingPatterns.java | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java index bbfcc3524..6fa3dd0b4 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf21Executor.java @@ -154,6 +154,7 @@ public class Sdf21Executor extends AbstractExecutor { .rgsCode(RegistryTradingParams.AS_T) .companyId(company.getId()) //раньше было stmt.getAddresseeId() .accountId(account.getId()) //раньше было stmt.getAccountId() + .securityId(stmt.getSecurityId()) .find(); astFound.ifPresentOrElse(rgs -> { log.debug("stmt.id={}, found AS*T.id={}, updating...", stmt.getId(), rgs.getId()); @@ -368,6 +369,11 @@ public class Sdf21Executor extends AbstractExecutor { return this; } + private RegistrySearch securityId(Long securityId) { + predicate = pb.and(predicate, pb.equals("securityId", securityId)); + return this; + } + private RegistrySearch status() { predicate = pb.and(predicate, pb.or( pb.equals("registryStatus", RegistryStatus.PROC.getKey()), diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java index 545887faa..2c1cc654a 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java @@ -178,7 +178,6 @@ public enum ReadingPatterns { public void reed(String line, SWTRecord record) { String[] cells = getValueWitoutKey(line, ":83D:").split(":"); cells = Arrays.copyOf(cells, 3); - record.setValFor35BTag(cells); record.setValFor83DTag(cells); } },