diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java index e514d9311..51f814557 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java @@ -112,7 +112,7 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder registriesForAddWithdraw = registryImdg.getCollectionObjectsByPredicate( pb.and( registryPredicate, diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java index c1241913a..cb95add4d 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoRegistersReportBuilder.java @@ -110,7 +110,7 @@ public class KSRepDepoRegistersReportBuilder extends CSVReportBuilder registriesForAddWithdraw = registryImdg.getCollectionObjectsByPredicate( pb.and( registryPredicate, diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java index 0c864b9fc..7c17976bb 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java @@ -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));