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

http://jira.mfd.msk:8088/browse/CLS-608 fix

Browse source
This commit is contained in:
akulikov 2023-12-29 16:56:09 +03:00
parent 227e76a5ce
commit 8d8322e009
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
View file

@ -72,9 +72,13 @@ public class ExecutionRegisterReportBuilder extends CSVReportBuilder<ExecutionRe
entity.setSeller(companyByCounterPartyId.getShortName()); entity.setSeller(companyByCounterPartyId.getShortName());
entity.setBuyer(companyByCounterPartyId.getShortName()); entity.setBuyer(companyByCounterPartyId.getShortName());
} }
entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue()); if (companySymbolsByCounterPartyId != null) {
entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
}
if (companySymbolsByCompanyId != null) {
entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue());
}
entity.setSellerTkr(input.getCounterPartyTradingClearingRegistry()); entity.setSellerTkr(input.getCounterPartyTradingClearingRegistry());
entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue());
entity.setBuyerTkr(input.getPartyTradingClearingRegistry()); entity.setBuyerTkr(input.getPartyTradingClearingRegistry());
} }
if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) { if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) {
@ -82,9 +86,13 @@ public class ExecutionRegisterReportBuilder extends CSVReportBuilder<ExecutionRe
entity.setSeller(companyByCompanyId.getShortName()); entity.setSeller(companyByCompanyId.getShortName());
entity.setBuyer(companyByCompanyId.getShortName()); entity.setBuyer(companyByCompanyId.getShortName());
} }
entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue()); if (companySymbolsByCompanyId != null) {
entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue());
}
if (companySymbolsByCounterPartyId != null) {
entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
}
entity.setSeller(input.getPartyTradingClearingRegistry()); entity.setSeller(input.getPartyTradingClearingRegistry());
entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
entity.setBuyerTkr(input.getCounterPartyTradingClearingRegistry()); entity.setBuyerTkr(input.getCounterPartyTradingClearingRegistry());
} }
} }