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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-08-28 18:54:55 +03:00
commit 2fc0ce5029
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/config/RegistriesFilterConfig.java
View file

@ -54,6 +54,7 @@ public class RegistriesFilterConfig {
predicateBuilder.regex("registryCode", "^[AD]M.*"), predicateBuilder.regex("registryCode", "^[AD]M.*"),
predicateBuilder.not(predicateBuilder.equals("securitySymbol", "RUB"))) predicateBuilder.not(predicateBuilder.equals("securitySymbol", "RUB")))
); );
put("outvBalance", predicateBuilder.regex("registryCode", "^AM.*"));
}}; }};
} }
} }

2
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/execution/ExecutionDepositController.java
View file

@ -65,7 +65,7 @@ public class ExecutionDepositController extends AbstractQueueController {
public CommonGetAllResponse getByFilter(@RequestParam(name = "pageSize", required = false) Optional<Integer> pageSize, public CommonGetAllResponse getByFilter(@RequestParam(name = "pageSize", required = false) Optional<Integer> pageSize,
@RequestParam(name = "pageIndex", required = false) Optional<Integer> pageIndex) { @RequestParam(name = "pageIndex", required = false) Optional<Integer> pageIndex) {
ImdgPredicate filter = imdgPredicateBuilder.and( ImdgPredicate filter = imdgPredicateBuilder.and(
imdgPredicateBuilder.greatEqual("settlementDate", LocalDate.now()), imdgPredicateBuilder.greatEqual("firstLegSettlementDate", LocalDate.now()),
imdgPredicateBuilder.equals("side", MoneyFlowSide.SELL.getKey())); imdgPredicateBuilder.equals("side", MoneyFlowSide.SELL.getKey()));
AtomicReference<Collection<Map<String, Object>>> all = new AtomicReference<>(); AtomicReference<Collection<Map<String, Object>>> all = new AtomicReference<>();
pageIndex.ifPresentOrElse(index -> pageIndex.ifPresentOrElse(index ->