From 679a7ebd2340204245fe2d8b4eb88b759af61ac9 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Mon, 14 Aug 2023 17:30:07 +0300
Subject: [PATCH] reports-service http://jira.mfd.msk:8088/browse/CLS-358
 refactoring predicate

---
 .../reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java | 3 +--
 .../reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
index 14e7853b7..d6ef80e0c 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashRegisterSumsReportBuilder.java
@@ -90,14 +90,13 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
                 }
                 if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
 
-                String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AM_T).build();
                 ImdgPredicateBuilder pbRegistry = registryImdg.predicateBuilder();
                 Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(
                         pbRegistry.and(
                                 pbRegistry.equals("companyId", statement.getAddresseeId()),
                                 pbRegistry.equals("account", statement.getAccount()),
                                 pbRegistry.in("accountType", AccountType.Clrn.getKey(), AccountType.Info.getKey()),
-                                pbRegistry.sql(sql)
+                                RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AM_T).buildPredicate(pbRegistry)
                         )
                 );
                 if (registries.isEmpty()) {
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
index 5ed5def3e..6a95ebbd7 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoRegisterQuantitiesReportBuilder.java
@@ -100,14 +100,13 @@ public class KSRepDepoRegisterQuantitiesReportBuilder extends CSVReportBuilder<E
                 }
                 if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
 
-                String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AS_T).build();
                 ImdgPredicateBuilder pbRegistry = registryImdg.predicateBuilder();
                 Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(
                         pbRegistry.and(
                                 pbRegistry.equals("companyId", statement.getAddresseeId()),
                                 pbRegistry.equals("account", statement.getAccount()),
                                 pbRegistry.equals("accountType", AccountType.Depo.getKey()),
-                                pbRegistry.sql(sql)
+                                RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.AS_T).buildPredicate(pbRegistry)
                         )
                 );
                 if (registries.isEmpty()) {