From 333603c937760f8de01d87dcce6f37676b1d03c0 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 28 Apr 2026 10:16:27 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-975 --- .../specific/PrecSessionStateMachineConfig.java | 2 +- .../specific/PrpcSessionStateMachineConfig.java | 2 +- .../state/action/InspectionObligationsPrecAction.java | 11 ++--------- .../management/error/DefaultManagementErrors.java | 4 +++- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrecSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrecSessionStateMachineConfig.java index 9f79cf235..048e331e1 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrecSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrecSessionStateMachineConfig.java @@ -120,7 +120,7 @@ public class PrecSessionStateMachineConfig extends EnumStateMachineConfigurerAda ); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.inspectionObligationsV2Action.setClearingMemberCategoryFilter( - category -> !ClearingCategory.P.equalsByKey(category) + category -> category == null || !ClearingCategory.P.equalsByKey(category) ); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrpcSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrpcSessionStateMachineConfig.java index dd3c656f8..adcc48be9 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrpcSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/PrpcSessionStateMachineConfig.java @@ -120,7 +120,7 @@ public class PrpcSessionStateMachineConfig extends EnumStateMachineConfigurerAda ); this.obligationAdmissionContinueAction.setDataEnum(DataEnum.obligationAdmissionStashedRgs); this.inspectionObligationsV2Action.setClearingMemberCategoryFilter( - ClearingCategory.P::equalsByKey + ctgr -> ctgr != null && ClearingCategory.P.equalsByKey(ctgr) ); } diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsPrecAction.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsPrecAction.java index 655485872..eb94a1239 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsPrecAction.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/action/InspectionObligationsPrecAction.java @@ -53,7 +53,6 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.enumeration.SimpleMessageResolver; import ru.spcex.platform.utils.number.BigDecimalUtil; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; -import ru.spcex.platform.utils.text.TextUtil; import ru.spcex.platform.utils.time.TimeUtil; @Service @@ -176,15 +175,9 @@ public class InspectionObligationsPrecAction extends ReviseStage1Action { rgs.getCompanyId() ).cashed(cmcImdg.predicateBuilder(), cmcCash); ClearingMemberCategory cmc = cmcImdg.getSingleObjectByPredicate(cmcPrdct); - if (cmc == null || TextUtil.isEmpty(cmc.getClearingMemberCategory())) { - log.error("couldn't find ClearingMemberCategory for group.id={}, rgs.id={}, company.id={}", - entry.getKey().groupId(), rgs.getId(), rgs.getCompanyId()); - setGroupStatusError.accept(group); - continue GROUP; - } - if (!cmcFilter.apply(cmc.getClearingMemberCategory())) { + if (!cmcFilter.apply(cmc != null ? cmc.getClearingMemberCategory() : null)) { log.debug("group.id={}, rgs.id={}, company.id={}: category {}, skipping", - entry.getKey().groupId(), rgs.getId(), rgs.getCompanyId(),cmc.getClearingMemberCategory()); + entry.getKey().groupId(), rgs.getId(), rgs.getCompanyId(), cmc != null ? cmc.getClearingMemberCategory() : "null"); continue; } ImdgPredicate am_bPrdct = AssetByTcrCompanyAccountCashedPredicate diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/error/DefaultManagementErrors.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/error/DefaultManagementErrors.java index 95c603c87..5f51ec69a 100644 --- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/error/DefaultManagementErrors.java +++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/error/DefaultManagementErrors.java @@ -3,7 +3,9 @@ package ru.spcex.clearing.dflt.management.error; import ru.spcex.platform.utils.enumeration.IErrorEnumId; public enum DefaultManagementErrors implements IErrorEnumId { - + //DictionaryNotFound(5003L), + //RecordNotFoundInDictionary(5423L), + //RecordNotFound(5406L), GeneralError(11000L), RecordNotFound(11001L), RecordAlreadyPresent(11002L),