treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-601 fixes

Browse source
This commit is contained in:
akulikov 2023-12-12 10:45:33 +03:00
parent 9a279eead8
commit 91b6f9efbc
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
View file

@ -177,10 +177,6 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
account = accountFromImdg.getAccount(); 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 tkrInitiator = null;
String accountInitiator = null; String accountInitiator = null;
ImdgPredicate tmtPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TM_T).buildPredicate(pb); ImdgPredicate tmtPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TM_T).buildPredicate(pb);
@ -204,6 +200,15 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
accountInitiator = accountFromImdg.getAccount(); 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 ksCommissionTradesReport = new KSCommissionTradesReport();
ksCommissionTradesReport.setFirmId(firmId); ksCommissionTradesReport.setFirmId(firmId);
@ -223,7 +228,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
ksCommissionTradesReport.setTrId(registry.getGroupId()); ksCommissionTradesReport.setTrId(registry.getGroupId());
ksCommissionTradesReport.setTkr(registry.getTradingClearingRegistry()); ksCommissionTradesReport.setTkr(registry.getTradingClearingRegistry());
ksCommissionTradesReport.setAccount(account); ksCommissionTradesReport.setAccount(account);
ksCommissionTradesReport.setSessionId(registry.getSessionId()); ksCommissionTradesReport.setSessionId(sessionId);
ksCommissionTradesReport.setSessionDate(sessionDate); ksCommissionTradesReport.setSessionDate(sessionDate);
ksCommissionTradesReport.setTkrInitiator(tkrInitiator); ksCommissionTradesReport.setTkrInitiator(tkrInitiator);
ksCommissionTradesReport.setAccountInitiator(accountInitiator); ksCommissionTradesReport.setAccountInitiator(accountInitiator);