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

итоговая МКР условия выборки регистров на шаге 4

Browse source
This commit is contained in:
ialbert 2023-06-07 16:04:35 +03:00
parent 2f2d99e7ce
commit 7bda8ea334
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
View file

@ -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());
}

7
platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/collection/Pair.java
View file

@ -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());
}
}