From 633f34ee51c66ac5f11df45772ffc5b9aa3f78a3 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 22 Sep 2023 17:54:32 +0300
Subject: [PATCH] =?UTF-8?q?reports-service=20http://jira.mfd.msk:8088/brow?=
 =?UTF-8?q?se/CLS-497=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ks/KSCommissionTradesReportBuilder.java   | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
index 82430f8d1..d85445fb4 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSCommissionTradesReportBuilder.java
@@ -82,7 +82,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 pb.sql(sql),
                 pb.equals("refundDate", nowDate),
                 pb.less("valueDate", nowDate),
-                pb.or(pb.equals("registryStatus", RegistryStatus.OK.getKey()), pb.equals("registryStatus", RegistryStatus.CLRD.getKey())),
+                pb.equals("registryStatus", RegistryStatus.CLRD.getKey()),
                 pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey()))
         );
         Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
@@ -103,7 +103,10 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                             registry.getCompanyId());
                     continue;
                 }
-                if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
+                if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) {
+                    log.debug("Company not active, registry[{}] skip.", registry.getId());
+                    continue;
+                }
 
                 String firmId = "";
                 String firmIdInitiator = "";
@@ -122,21 +125,20 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                     }
                 }
 
-                sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.OM_T).build();
-                Registry omtRegistry = registryImdg.getFirstObjectByPredicate(
-                        pb.and(
-                                pb.sql(sql),
-                                pb.equals("contract", registry.getContract()),
-                                pb.notNull("groupId")
-                        )
-                );
-                if (omtRegistry == null) {
-                    log.warn("Can't find pair OM_T registry for contract = {}. Registry id = {} skipped",
-                            registry.getContract(),
-                            registry.getId());
-                    continue;
-                }
-
+//                sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.OM_T).build();
+//                Registry omtRegistry = registryImdg.getFirstObjectByPredicate(
+//                        pb.and(
+//                                pb.sql(sql),
+//                                pb.equals("contract", registry.getContract()),
+//                                pb.notNull("groupId")
+//                        )
+//                );
+//                if (omtRegistry == null) {
+//                    log.warn("Can't find pair OM_T registry for contract = {}. Registry id = {} skipped",
+//                            registry.getContract(),
+//                            registry.getId());
+//                    continue;
+//                }
 //                String tradeNum = extractPartAgreementNumber(String.valueOf(omtRegistry.getGroupId()));
 //                if (tradeNum == null) {
 //                    log.warn("Can't extract TradeNum from GroupId (groupId = {} for OM_T registry id = {}). " +