From 91b6f9efbc35f73d74267341836d10259f9e11bb Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Tue, 12 Dec 2023 10:45:33 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-601 fixes

---
 .../ks/KSCommissionTradesReportBuilder.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
index bd94ed996..f24aa0f5b 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
@@ -177,10 +177,6 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                     account = accountFromImdg.getAccount();
                 }
 
-                Session session = sessionImdg.getSingleObjectByID(registry.getSessionId());
-                LocalDateTime sessionDate = null;
-                if (session != null) sessionDate = LocalDateTime.ofInstant(session.getCreated(), getReportZoneId());
-
                 String tkrInitiator = null;
                 String accountInitiator = null;
                 ImdgPredicate tmtPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TM_T).buildPredicate(pb);
@@ -204,6 +200,15 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                         accountInitiator = accountFromImdg.getAccount();
                     }
                 }
+                Session session = sessionImdg.getSingleObjectByID(registry.getSessionId());
+                LocalDateTime sessionDate = null;
+                Long sessionId = null;
+                if (registryStatus != RegistryStatus.MNG && registryStatus != RegistryStatus.PROC) {
+                    sessionId = registry.getSessionId();
+                    if (session != null) {
+                        sessionDate = LocalDateTime.ofInstant(session.getCreated(), getReportZoneId());
+                    }
+                }
 
                 KSCommissionTradesReport ksCommissionTradesReport = new KSCommissionTradesReport();
                 ksCommissionTradesReport.setFirmId(firmId);
@@ -223,7 +228,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
                 ksCommissionTradesReport.setTrId(registry.getGroupId());
                 ksCommissionTradesReport.setTkr(registry.getTradingClearingRegistry());
                 ksCommissionTradesReport.setAccount(account);
-                ksCommissionTradesReport.setSessionId(registry.getSessionId());
+                ksCommissionTradesReport.setSessionId(sessionId);
                 ksCommissionTradesReport.setSessionDate(sessionDate);
                 ksCommissionTradesReport.setTkrInitiator(tkrInitiator);
                 ksCommissionTradesReport.setAccountInitiator(accountInitiator);