From 7349cc67ab1b481fcceafd490905a5dbe8b2edc4 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Thu, 11 Jul 2024 17:02:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=BA=2094715bdd=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20IPO0=20=D0=B8=20UN?= =?UTF-8?q?IT=20=D1=81=D0=B5=D1=81=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/executors/Sdf57Executor.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java index 2a5badb39..da8277f7b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.time.Instant; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.List; @@ -193,10 +194,17 @@ public class Sdf57Executor extends AbstractExecutor { boolean sessionIsPresent = sessionImdg.getFirstObjectByFieldValues(Map.of( "workflowStatus", SessionStatus.ACTV.getKey() )) != null; - boolean existActiveCurrSession = sessionImdg.getFirstObjectByFieldValues( - Map.of( - "workflowStatus", SessionStatus.ACTV.getKey(), - "sessionType", SessionType.CURR.getKey() + + ImdgPredicateBuilder sessionPredicateBuilder = sessionImdg.predicateBuilder(); + boolean existActiveCurrSession = sessionImdg.getFirstObjectByPredicate( + sessionPredicateBuilder.and( + sessionPredicateBuilder.equals("workflowStatus", SessionStatus.ACTV.getKey()), + sessionPredicateBuilder.in("sessionType", + Arrays.asList( + SessionType.CURR.getKey(), + SessionType.IPO0.getKey(), + SessionType.UNIT.getKey()) + .toArray(new String[0])) )) != null; sdf = sdf.stream().sorted(Comparator.comparing(SpcexObjectBase::getId)).toList(); for (SDf57 sdf57 : sdf) {