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

fix KSRepCashRegistersReportBuilder, KSRepDepoRegistersReportBuilder

Browse source
This commit is contained in:
akulikov 2023-10-11 16:19:32 +03:00
parent 50ebdbacb9
commit 789f18181a
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,7 +112,7 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder<EmptyParam
BigDecimal settleDebit = registry.getSettledDebit() != null ? registry.getSettledDebit() : BigDecimal.ZERO;
ksRepCashRegistersReport.setChangeBalance(settleCredit.subtract(settleDebit));
registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.DMAI).buildPredicate(pb);
registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.DM_I).buildPredicate(pb);
Collection<Registry> registriesForAddWithdraw = registryImdg.getCollectionObjectsByPredicate(
pb.and(
registryPredicate,

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

@ -110,7 +110,7 @@ public class KSRepDepoRegistersReportBuilder extends CSVReportBuilder<EmptyParam
BigDecimal settledDebit = registry.getSettledDebit() != null ? registry.getSettledDebit() : BigDecimal.ZERO;
ksRepDepoRegistersReport.setChangeQuantity(settledCredit.subtract(settledDebit));
registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.DMAI).buildPredicate(pb);
registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.DS_I).buildPredicate(pb);
Collection<Registry> registriesForAddWithdraw = registryImdg.getCollectionObjectsByPredicate(
pb.and(
registryPredicate,

24
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java
View file

@ -153,10 +153,9 @@ public class ReportServiceTest_KS {
addWithdrawRegistry_1.setSecurityId(777L);
addWithdrawRegistry_1.setAccountId(888L);
addWithdrawRegistry_1.setRegistryStatus(RegistryStatus.OK.getKey());
addWithdrawRegistry_1.setRegistryCode("DMAI");
addWithdrawRegistry_1.setRegistryCode("DM_I");
addWithdrawRegistry_1.setRegistryDesignation(RegistryDesignation.D.getKey());
addWithdrawRegistry_1.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
addWithdrawRegistry_1.setRegistryCapacity(RegistryCapacity.A.getKey());
addWithdrawRegistry_1.setRegistryUnit(RegistryUnit.I.getKey());
addWithdrawRegistry_1.setUpdated(Instant.now());
addWithdrawRegistry_1.setBalance(BigDecimal.TEN);
@ -167,10 +166,9 @@ public class ReportServiceTest_KS {
addWithdrawRegistry_2.setSecurityId(777L);
addWithdrawRegistry_2.setAccountId(888L);
addWithdrawRegistry_2.setRegistryStatus(RegistryStatus.OK.getKey());
addWithdrawRegistry_2.setRegistryCode("DMAI");
addWithdrawRegistry_2.setRegistryCode("DM_I");
addWithdrawRegistry_2.setRegistryDesignation(RegistryDesignation.D.getKey());
addWithdrawRegistry_2.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
addWithdrawRegistry_2.setRegistryCapacity(RegistryCapacity.A.getKey());
addWithdrawRegistry_2.setRegistryUnit(RegistryUnit.I.getKey());
addWithdrawRegistry_2.setUpdated(Instant.now());
addWithdrawRegistry_2.setBalance(BigDecimal.ONE);
@ -181,10 +179,9 @@ public class ReportServiceTest_KS {
addWithdrawRegistry_3.setSecurityId(777L);
addWithdrawRegistry_3.setAccountId(888L);
addWithdrawRegistry_3.setRegistryStatus(RegistryStatus.OK.getKey());
addWithdrawRegistry_3.setRegistryCode("DMAI");
addWithdrawRegistry_3.setRegistryCode("DM_I");
addWithdrawRegistry_3.setRegistryDesignation(RegistryDesignation.D.getKey());
addWithdrawRegistry_3.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
addWithdrawRegistry_3.setRegistryCapacity(RegistryCapacity.A.getKey());
addWithdrawRegistry_3.setRegistryUnit(RegistryUnit.I.getKey());
addWithdrawRegistry_3.setUpdated(Instant.now());
addWithdrawRegistry_3.setBalance(BigDecimal.valueOf(100L));
@ -299,10 +296,9 @@ public class ReportServiceTest_KS {
addWithdrawRegistry_1.setSecurityId(777L);
addWithdrawRegistry_1.setAccountId(888L);
addWithdrawRegistry_1.setRegistryStatus(RegistryStatus.OK.getKey());
addWithdrawRegistry_1.setRegistryCode("DMAI");
addWithdrawRegistry_1.setRegistryCode("DS_I");
addWithdrawRegistry_1.setRegistryDesignation(RegistryDesignation.D.getKey());
addWithdrawRegistry_1.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
addWithdrawRegistry_1.setRegistryCapacity(RegistryCapacity.A.getKey());
addWithdrawRegistry_1.setRegistryInstrumentType(RegistryInstrumentType.S.getKey());
addWithdrawRegistry_1.setRegistryUnit(RegistryUnit.I.getKey());
addWithdrawRegistry_1.setUpdated(Instant.now());
addWithdrawRegistry_1.setBalance(BigDecimal.TEN);
@ -313,10 +309,9 @@ public class ReportServiceTest_KS {
addWithdrawRegistry_2.setSecurityId(777L);
addWithdrawRegistry_2.setAccountId(888L);
addWithdrawRegistry_2.setRegistryStatus(RegistryStatus.OK.getKey());
addWithdrawRegistry_2.setRegistryCode("DMAI");
addWithdrawRegistry_2.setRegistryCode("DS_I");
addWithdrawRegistry_2.setRegistryDesignation(RegistryDesignation.D.getKey());
addWithdrawRegistry_2.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
addWithdrawRegistry_2.setRegistryCapacity(RegistryCapacity.A.getKey());
addWithdrawRegistry_2.setRegistryInstrumentType(RegistryInstrumentType.S.getKey());
addWithdrawRegistry_2.setRegistryUnit(RegistryUnit.I.getKey());
addWithdrawRegistry_2.setUpdated(Instant.now());
addWithdrawRegistry_2.setBalance(BigDecimal.ONE);
@ -327,10 +322,9 @@ public class ReportServiceTest_KS {
addWithdrawRegistry_3.setSecurityId(777L);
addWithdrawRegistry_3.setAccountId(888L);
addWithdrawRegistry_3.setRegistryStatus(RegistryStatus.OK.getKey());
addWithdrawRegistry_3.setRegistryCode("DMAI");
addWithdrawRegistry_3.setRegistryCode("DS_I");
addWithdrawRegistry_3.setRegistryDesignation(RegistryDesignation.D.getKey());
addWithdrawRegistry_3.setRegistryInstrumentType(RegistryInstrumentType.M.getKey());
addWithdrawRegistry_3.setRegistryCapacity(RegistryCapacity.A.getKey());
addWithdrawRegistry_3.setRegistryInstrumentType(RegistryInstrumentType.S.getKey());
addWithdrawRegistry_3.setRegistryUnit(RegistryUnit.I.getKey());
addWithdrawRegistry_3.setUpdated(Instant.now());
addWithdrawRegistry_3.setBalance(BigDecimal.valueOf(100L));