From e1d565522bdf2723913636ad775954fac6506fed Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 20 Jul 2023 16:22:14 +0300 Subject: [PATCH] =?UTF-8?q?5=20=D1=88=D0=B0=D0=B3=20=D1=81=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B8=D0=B8=20=D0=BF=D0=BE=20=D0=B2=D0=BE=D0=B7=D0=B2?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D1=83:=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20DM?= =?UTF-8?q?*T(clnr)=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=BA=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spcex/clearing/service/RegistryManager.java | 3 +++ .../impl/InspectionObligationsDepositReturn.java | 15 +-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryManager.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryManager.java index baab4ae63..c768d076d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryManager.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/RegistryManager.java @@ -8,6 +8,7 @@ import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; +import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryAssetPredicate; import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder; import ru.spcex.platform.imdg.api.predicate.specific.RegistryDm_tClrnPredicate; @@ -54,6 +55,8 @@ public class RegistryManager { ImdgPredicate dmtClrnPrdct = RegistryDm_tClrnPredicate .instance(rgs.getCompanyId(), rgs.getCounterPartyId()) .apply(rgsImdg); + ImdgPredicateBuilder rgsPb = rgsImdg.predicateBuilder(); + dmtClrnPrdct = rgsPb.and(dmtClrnPrdct, rgsPb.equals("contract", rgs.getContract())); Registry dmt = rgsImdg.getSingleObjectByPredicate(dmtClrnPrdct); return Optional.ofNullable(dmt); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java index 95556413d..57180074c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java @@ -127,7 +127,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { } continue; } - Optional dmtClnr = searchDmtClrn(omtRgs); + Optional dmtClnr = rgsMng.searchDmtClrn(omtRgs); if (dmtClnr.isPresent()) { BigDecimal dmtBalance = safeBD(dmtClnr.get().getBalance()); log.debug("OM*T.id={} -> DM*T(CLNR).id={}, dmtBalance={}, omtBalance={}, amfBalance={}", @@ -156,19 +156,6 @@ public class InspectionObligationsDepositReturn implements ISessionStage { registryImdg.update(registry); } - /** - * Если УК зачисляет средства на свой ТБС - */ - private Optional searchDmtClrn(Registry rgs) { - String sqlCondition = String.format("(%s) and accountType='%s' and companyId = %d and counterPartyId = %d", - RegistryCodeSqlBuilder.getInstance(DM_T).build(), - AccountType.Clrn.getKey(), - rgs.getCompanyId(), - rgs.getCounterPartyId()); - Registry dmt = registryImdg.getFirstObjectBySQL(sqlCondition); - return Optional.ofNullable(dmt); - } - private Optional searchAssetByOMT(Registry obligation) { String sqlCondition = String.format("%s and " + "tradingClearingRegistryId = '%s' and " +