From 8400bafe4d85f41427219df1afb65400b3264923 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 28 Aug 2024 14:57:31 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=BB=D1=8F=20execution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/queue/execution/ExecutionDepositController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionDepositController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionDepositController.java index 8cf0688dd..2b6d037f5 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionDepositController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionDepositController.java @@ -65,7 +65,7 @@ public class ExecutionDepositController extends AbstractQueueController { public CommonGetAllResponse getByFilter(@RequestParam(name = "pageSize", required = false) Optional pageSize, @RequestParam(name = "pageIndex", required = false) Optional pageIndex) { ImdgPredicate filter = imdgPredicateBuilder.and( - imdgPredicateBuilder.greatEqual("settlementDate", LocalDate.now()), + imdgPredicateBuilder.greatEqual("firstLegSettlementDate", LocalDate.now()), imdgPredicateBuilder.equals("side", MoneyFlowSide.SELL.getKey())); AtomicReference>> all = new AtomicReference<>(); pageIndex.ifPresentOrElse(index -> From e88e0f8387de3a812d8fe2ca4ce6c447eccd6fed Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Wed, 28 Aug 2024 16:08:37 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=BB=D1=8F=20registry=20^AM.*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spcex/clearing/backendapi/config/RegistriesFilterConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/RegistriesFilterConfig.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/RegistriesFilterConfig.java index 3de3b94b6..5aff020d5 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/RegistriesFilterConfig.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/RegistriesFilterConfig.java @@ -54,6 +54,7 @@ public class RegistriesFilterConfig { predicateBuilder.regex("registryCode", "^[AD]M.*"), predicateBuilder.not(predicateBuilder.equals("securitySymbol", "RUB"))) ); + put("outvBalance", predicateBuilder.regex("registryCode", "^AM.*")); }}; } }