From 7bda8ea334497b299620135a773a26bf4e640fc3 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Wed, 7 Jun 2023 16:04:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=82=D0=BE=D0=B3=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D0=9C=D0=9A=D0=A0=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=88=D0=B0=D0=B3=D0=B5=204?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clearing/session/stage/FinalMkrSession.java      | 12 +++++++-----
 .../ru/spcex/platform/utils/collection/Pair.java     |  7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
index 4b5096a46..39da49f47 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
@@ -88,11 +88,13 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
         //fixme спросить у Кости нужны ли эти поправки
         ImdgPredicateBuilder rgsPrctBuilder = registryImdg.predicateBuilder();
         inclusionObligations.addRegistryCondition(
-                rgsPrctBuilder.or(rgsPrctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()),
-                        rgsPrctBuilder.equals("registryStatus", RegistryStatus.MNG.getKey()))
-        );
-        inclusionObligations.addRegistryCondition(
-                rgsPrctBuilder.less("valueDate", LocalDate.now())
+                rgsPrctBuilder.and(
+                        rgsPrctBuilder.or(
+                                rgsPrctBuilder.equals("registryStatus", RegistryStatus.PROC.getKey()),
+                                rgsPrctBuilder.equals("registryStatus", RegistryStatus.MNG.getKey())
+                        ),
+                        rgsPrctBuilder.lessEqual("valueDate", LocalDate.now())
+                )
         );
         inspectionObligations.setSessionType(sectionType());
     }
diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/collection/Pair.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/collection/Pair.java
index 3fb512341..281bf36fb 100644
--- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/collection/Pair.java
+++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/collection/Pair.java
@@ -1,5 +1,7 @@
 package ru.spcex.platform.utils.collection;
 
+import java.util.function.Consumer;
+
 public class Pair<T1, T2> {
     private T1 first;
     private T2 second;
@@ -24,4 +26,9 @@ public class Pair<T1, T2> {
     public void setSecond(T2 second) {
         this.second = second;
     }
+
+    public static <T1> void forEach(Pair<T1, T1> p, Consumer<T1> consumer) {
+        consumer.accept(p.getFirst());
+        consumer.accept(p.getSecond());
+    }
 }