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 { private T1 first; private T2 second; @@ -24,4 +26,9 @@ public class Pair { public void setSecond(T2 second) { this.second = second; } + + public static void forEach(Pair p, Consumer consumer) { + consumer.accept(p.getFirst()); + consumer.accept(p.getSecond()); + } }