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 money/depo balance register, money/depo payment instruction report added

Browse source
This commit is contained in:
akulikov 2023-12-29 14:08:48 +03:00
parent 256f88a5c5
commit 256dfafce3
8 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ public class DepoBalanceRegisterReport implements CSVReport {
@CsvBindByName(column = "Количество ЦБ")
@CsvBindByPosition(position = 7)
@CsvNumber(value = "#0.00", writeFormat = "#0.00")
@CsvNumber(value = "#0", writeFormat = "#0")
private BigDecimal sum;
public String getHouseName() {

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

@ -42,7 +42,7 @@ public class MoneyBalanceRegisterReport implements CSVReport {
@CsvBindByName(column = "Остаток денежных средств")
@CsvBindByPosition(position = 7)
@CsvNumber(value = "#0.00", writeFormat = "#0.00")
@CsvNumber(value = "#0", writeFormat = "#0")
private BigDecimal sum;

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

@ -45,7 +45,7 @@ public abstract class CSVReportBuilder<R extends CSVReport, I extends BusinessOb
* Название отчета, используется для формирования имени отчета (без указания формата)
*/
protected String getReportFilename() {
return "%s_%s".formatted(reportName(), dateTimeFormatter_YYMMDDHHmmssSSS.format(LocalDateTime.now()));
return "%s %s".formatted(reportName(), dateTimeFormatter_YYMMDDHHmmssSSS.format(LocalDateTime.now()));
}
/**

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

@ -24,7 +24,7 @@ public class DepoBalanceRegisterReportBuilder extends CSVReportBuilder<DepoBalan
@Override
protected String reportName() {
return "depo_balance_register";
return "Реестр остатков ценных бумаг";
}
@Override
@ -38,18 +38,14 @@ public class DepoBalanceRegisterReportBuilder extends CSVReportBuilder<DepoBalan
LocalTime nowTime = LocalTime.now();
DepoBalanceRegisterReport entity = new DepoBalanceRegisterReport();
Company company = companyImdg.getSingleObjectByID(2L);
if (company != null) entity.setHouseName(company.getShortName());
entity.setHouseName("АО РЦД");
entity.setNumber(yyyyMMddFormat.format(now));
entity.setDate(now);
entity.setTime(nowTime);
company = companyImdg.getSingleObjectByID(input.getCompanyId());
if (company != null) entity.setCompany(company.getShortName());
entity.setCompany(input.getShortName());
AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, input.getAccountType());
if (accountType == AccountType.Clrn || accountType == AccountType.Info) entity.setAccount(input.getAccount());
if (accountType == AccountType.Depo) entity.setAccount(input.getAccount());
entity.setSecurity(input.getSecuritySymbol());
entity.setSum(input.getBalance());

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

@ -24,7 +24,7 @@ public class MoneyBalanceRegisterReportBuilder extends CSVReportBuilder<MoneyBal
@Override
protected String reportName() {
return "money_balance_register";
return "Реестр остатков денежных средств";
}
@Override
@ -45,9 +45,7 @@ public class MoneyBalanceRegisterReportBuilder extends CSVReportBuilder<MoneyBal
entity.setDate(now);
entity.setTime(nowTime);
entity.setCurrency("RUR");
company = companyImdg.getSingleObjectByID(input.getCompanyId());
if (company != null) entity.setCompany(company.getShortName());
entity.setCompany(input.getShortName());
AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, input.getAccountType());
if (accountType == AccountType.Clrn || accountType == AccountType.Info) entity.setAccount(input.getAccount());

2
clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterServiceTest.java
View file

@ -184,7 +184,7 @@ class DepoPaymentInstructionRegisterServiceTest implements InitializingBean {
File outFile = outFolder.listFiles()[0];
File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports/depo_payment_instruction_register_expected.csv").getFile());
ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения"));
ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения", "Номер распоряжения"));
settings.setCsvMode(oldCsvMode);

2
clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterServiceTest.java
View file

@ -179,7 +179,7 @@ class MoneyPaymentInstructionRegisterServiceTest implements InitializingBean {
File outFile = outFolder.listFiles()[0];
File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports/money_payment_instruction_register_expected.csv").getFile());
ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения"));
ReportTestUtils.compareCSVFiles(expectedFile, outFile, Arrays.asList("Время формирования", "Дата распоряжения", "Номер распоряжения"));
settings.setCsvMode(oldCsvMode);
ReportTestUtils.deleteDir(outFolder);

2
clearing-parent/registry-service/src/test/resources/expected_reports/depo_balance_register_expected.csv
View file

@ -1,2 +1,2 @@
"Наименование Расчетного депозитария","Номер отчета","Дата","Время","Краткое наименование УК","Номер торгового раздела счета депо/ код раздела «к размещению/выкупу»","Код ЦБ","Количество ЦБ"
,"20231228","28.12.2023","18:54:21",,,"SECURITY_SYMBOL","1"
"АО РЦД","20231228","28.12.2023","18:54:21",,"ACCOUNT","SECURITY_SYMBOL","1"

1 Наименование Расчетного депозитария Номер отчета Дата Время Краткое наименование УК Номер торгового раздела счета депо/ код раздела «к размещению/выкупу» Код ЦБ Количество ЦБ
2 АО РЦД 20231228 28.12.2023 18:54:21 ACCOUNT SECURITY_SYMBOL 1