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

registry-service ExecutionRegisterReport правки + новое поле

Browse source
This commit is contained in:
AKurakin 2024-02-06 12:43:19 +03:00
parent c8f65428ff
commit 57855bd8b5
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/bean/ExecutionRegisterReport.java
View file

@ -80,6 +80,10 @@ public class ExecutionRegisterReport implements FileReport {
@CsvBindByPosition(position = 15) @CsvBindByPosition(position = 15)
private String status; private String status;
@CsvBindByName(column = "Код режима")
@CsvBindByPosition(position = 16)
private String market;
public String getClearingOrganization() { public String getClearingOrganization() {
return clearingOrganization; return clearingOrganization;
@ -208,4 +212,12 @@ public class ExecutionRegisterReport implements FileReport {
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
} }

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

@ -80,9 +80,11 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
Company companyByCompanyId = companyImdg.getSingleObjectByID(input.getCompanyId()); Company companyByCompanyId = companyImdg.getSingleObjectByID(input.getCompanyId());
if (Arrays.asList(Side.BUY.getKey(), MoneyFlowSide.BUY.getKey()).contains(input.getSide().toUpperCase())) { if (Arrays.asList(Side.BUY.getKey(), MoneyFlowSide.BUY.getKey()).contains(input.getSide().toUpperCase())) {
if (companyByCompanyId != null) {
entity.setBuyer(companyByCompanyId.getShortName());
}
if (companyByCounterPartyId != null) { if (companyByCounterPartyId != null) {
entity.setSeller(companyByCounterPartyId.getShortName()); entity.setSeller(companyByCounterPartyId.getShortName());
entity.setBuyer(companyByCounterPartyId.getShortName());
} }
if (companySymbolsByCounterPartyId != null) { if (companySymbolsByCounterPartyId != null) {
entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue()); entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
@ -95,7 +97,9 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
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())) {
if (companyByCompanyId != null) { if (companyByCompanyId != null) {
entity.setSeller(companyByCompanyId.getShortName()); entity.setSeller(companyByCompanyId.getShortName());
entity.setBuyer(companyByCompanyId.getShortName()); }
if (companyByCounterPartyId != null) {
entity.setBuyer(companyByCounterPartyId.getShortName());
} }
if (companySymbolsByCompanyId != null) { if (companySymbolsByCompanyId != null) {
entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue()); entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue());
@ -128,6 +132,7 @@ public class ExecutionRegisterReportBuilder extends XLSXReportBuilder<ExecutionR
); );
if (allowed != null) entity.setStatus(allowed.getName()); if (allowed != null) entity.setStatus(allowed.getName());
} }
entity.setMarket(input.getMarket());
return entity; return entity;
} }