From 67a1bcede09cda41d10cf8a8c4e3734ce9858732 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 23 May 2023 19:01:57 +0300 Subject: [PATCH] =?UTF-8?q?lim-exporter=20CLS-262=20=D0=BF=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/MoneyExporterService.java | 18 ++++++++++-------- .../services/SecurityExporterService.java | 10 +++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java index 06bb45816..121b32210 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java @@ -36,14 +36,16 @@ public class MoneyExporterService extends AbstractExporterService { log.debug("Started loading and formation of money file lines"); LocalDate currentDate = LocalDate.now(); List limFileRows = new ArrayList<>(); - Collection registriesA = registryImdg.getCollectionObjectsByFieldValues( - Map.of("registryDesignation", "A", - "registryInstrumentType", "M", - "registryUnit", "F")); - Collection registriesD = registryImdg.getCollectionObjectsByFieldValues( - Map.of("registryDesignation", "D", - "registryInstrumentType", "M", - "registryUnit", "T")); + Collection registriesA = registryImdg.getCollectionObjectsByFieldValues(Map.of( + "registryDesignation", "A", + "registryInstrumentType", "M", + "registryUnit", "F" + )); + Collection registriesD = registryImdg.getCollectionObjectsByFieldValues(Map.of( + "registryDesignation", "D", + "registryInstrumentType", "M", + "registryUnit", "T" + )); Map> byTcrA = registriesA.stream() .collect(Collectors.groupingBy(Registry::getTradingClearingRegistry)); Map> byTcrD = registriesD.stream() diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java index bece85a3c..63d439dda 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java @@ -35,11 +35,11 @@ public class SecurityExporterService extends AbstractExporterService { log.debug("Started loading and formation of DEPO file lines"); LocalDate currentDate = LocalDate.now(); List limFileRows = new ArrayList<>(); - Collection registries = registryImdg.getCollectionObjectsByFieldValues( - Map.of("registryDesignation", "A", - "registryInstrumentType", "S", - "registryCode", "T", - "clearingDate", currentDate)); + Collection registries = registryImdg.getCollectionObjectsByFieldValues(Map.of( + "registryDesignation", "A", + "registryInstrumentType", "S", + "registryUnit", "T" + )); for (Registry registry : registries) { if (checkNotBlocked(registry)) { limFileRows.add(getRow(registry));