From ffb3e13ba22c9e1191c6d24bfdabf8bd92e74db5 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Thu, 10 Oct 2024 18:27:09 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-767

---
 .../builders/ks/KSRepLccNettoReportBuilder.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccNettoReportBuilder.java
index 0a732343b..ac965db8d 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccNettoReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccNettoReportBuilder.java
@@ -72,7 +72,10 @@ public class KSRepLccNettoReportBuilder extends CSVReportBuilder<EmptyParams, KS
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(
             pb.and(
                 registryPredicate,
-                pb.equals("settlementDate", now)
+                pb.or(
+                    pb.equals("settlementDate", now),
+                    pb.equals("settlementDate", now.plusDays(1))
+                )
             )
         );
         Map<SecuritySymbolSettlementDateTKR, List<Registry>> groupedRegistries = registries.stream()
@@ -90,6 +93,7 @@ public class KSRepLccNettoReportBuilder extends CSVReportBuilder<EmptyParams, KS
 
 
         for (Map.Entry<SecuritySymbolSettlementDateTKR, List<Registry>> entry : groupedRegistries.entrySet()) {
+            SecuritySymbolSettlementDateTKR securitySymbolSettlementDateTKR = entry.getKey();
             List<Registry> registriesForTKR = entry.getValue();
             Registry sampleRegistry = registriesForTKR.iterator().next();
             for (Registry registry : registriesForTKR) {
@@ -111,7 +115,7 @@ public class KSRepLccNettoReportBuilder extends CSVReportBuilder<EmptyParams, KS
                 ksRepLccNettoReport.setFirmId(sampleRegistry.getTradingCode());
                 ksRepLccNettoReport.setTkr(sampleRegistry.getTradingClearingRegistry());
                 ksRepLccNettoReport.setCurrencyId(sampleRegistry.getSecuritySymbol());
-                ksRepLccNettoReport.setDate(now);
+                ksRepLccNettoReport.setDate(securitySymbolSettlementDateTKR.settlementDate);
 
                 BigDecimal debit = BigDecimal.ZERO;
                 BigDecimal credit = BigDecimal.ZERO;
@@ -128,6 +132,7 @@ public class KSRepLccNettoReportBuilder extends CSVReportBuilder<EmptyParams, KS
                             }
                         }
                     } else if (dataType == DataTypes.PR_NETTOSUM) {
+                        if (!registry.getSettlementDate().equals(now)) continue;
                         if (status == RegistryStatus.CLRD) {
                             if (designation == RegistryDesignation.O) {
                                 debit = debit.add(registry.getBalance() != null ? registry.getBalance() : BigDecimal.ZERO);
@@ -137,6 +142,7 @@ public class KSRepLccNettoReportBuilder extends CSVReportBuilder<EmptyParams, KS
                             }
                         }
                     } else if (dataType == DataTypes.FX_DEBT) {
+                        if (!registry.getSettlementDate().equals(now)) continue;
                         if (designation == RegistryDesignation.A) {
                             if (registry.getBalance() != null && registry.getBalance().compareTo(BigDecimal.ZERO) < 0) {
                                 debit = debit.add(registry.getBalance());
@@ -144,6 +150,7 @@ public class KSRepLccNettoReportBuilder extends CSVReportBuilder<EmptyParams, KS
                         }
                     }
                 }
+                if (!ksRepLccNettoReport.getDate().equals(now) && dataType != DataTypes.FX_OBLIG) continue;
                 ksRepLccNettoReport.setDataType(dataType.value);
                 ksRepLccNettoReport.setDebit(debit);
                 ksRepLccNettoReport.setCredit(credit);