diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java index 92137a4f0..6c944cdcd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligations.java @@ -64,11 +64,15 @@ public class InspectionObligations implements ISessionStage { RegistryStatus.POOL.getKey()); Collection registriesToProcess = registryImdg.getCollectionObjectsBySQL(sqlCondition); - Map> registriesByGroup = registriesToProcess.stream(). - collect(Collectors.groupingBy(Registry::getGroupId)); + List>> registriesByGroupSorted = registriesToProcess.stream(). + collect(Collectors.groupingBy(Registry::getGroupId)) + .entrySet() + .stream() + .sorted(Map.Entry.comparingByKey()) + .toList(); - log.info("found {} ({} groups) registries by sql: {}", registriesToProcess.size(), registriesByGroup.size(), sqlCondition); - for (Map.Entry> entry : registriesByGroup.entrySet()) { + log.info("found {} ({} groups) registries by sql: {}", registriesToProcess.size(), registriesByGroupSorted.size(), sqlCondition); + for (Map.Entry> entry : registriesByGroupSorted) { List group = entry.getValue(); List obligationsInGroup = group.stream().filter(registry -> IEnumKey.getEnumByKey(RegistryDesignation.class, registry.getRegistryDesignation()) == RegistryDesignation.O).toList(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java index 24c8ebecc..fb7aa2aa2 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java @@ -58,12 +58,16 @@ public class InspectionObligationsDepositReturn implements ISessionStage { RegistryCodeSqlBuilder.getInstance(OS_T, OM_T, TS_T, TM_T).build(), RegistryStatus.POOL.getKey()); - Map> registriesByGroup = registryImdg.getCollectionObjectsBySQL(sqlCondition) - .stream(). - collect(Collectors.groupingBy(Registry::getGroupId)); - log.info("registry groups found {}", registriesByGroup.size()); + List>> registriesByGroupSorted = registryImdg.getCollectionObjectsBySQL(sqlCondition) + .stream() + .collect(Collectors.groupingBy(Registry::getGroupId)) + .entrySet() + .stream() + .sorted(Map.Entry.comparingByKey()) + .toList(); + log.info("registry groups found {}", registriesByGroupSorted.size()); - for (Map.Entry> entry : registriesByGroup.entrySet()) { + for (Map.Entry> entry : registriesByGroupSorted) { List group = entry.getValue(); Optional omtInGroupO = group.stream().filter(registry -> equalByRgs(OM_T, registry)).findFirst(); if (omtInGroupO.isEmpty()) {