From 39ccef91a522a1ccb9a0d0a2ea13c3338ecd97fe Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 25 Jul 2023 16:05:34 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-437 --- .../service/ExcludeLiabilitiesRegisterService.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java index d07e4bbcc..908793af9 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java @@ -17,10 +17,7 @@ import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExcludeLiabilitiesRegisterNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.enumeration.RegistryCode; -import ru.spcex.platform.enumeration.RegistryDesignation; -import ru.spcex.platform.enumeration.RegistryInstrumentType; -import ru.spcex.platform.enumeration.RegistryStatus; +import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.time.TimeUtil; @@ -90,9 +87,10 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements log.trace("Started generating ExcludeLiabilitiesRegister entity..."); ExcludeLiabilitiesRegister excludeLiabilitiesRegister = new ExcludeLiabilitiesRegister(); //hz communicating - Session sessionBySessionId = sessionMap.getFirstObjectByFieldValues(Map.of("clearingDate", registry.getSessionId())); + Session sessionBySessionId = sessionMap.getSingleObjectByID(registry.getSessionId()); LocalDate validToDate = TimeUtil.toLocalDate(sessionBySessionId.getUpdated()); - Map> innPredicates = Map.of("companySymbol", "INN", "companyId", registry.getCompanyId()); + Map> innPredicates = Map.of("companySymbol", CompanySymbol.INN.getKey(), + "companyId", registry.getCompanyId()); ru.clearing.classes.statics.data.company.CompanySymbols companySymbol = companySymbolMap.getFirstObjectByFieldValues(innPredicates); MoneyMarketSecurity moneyMarketSecurity = moneyMarketSecurityMap.getFirstObjectByFieldValues(Map.of("securityId", registry.getSecurityId())); @@ -117,8 +115,7 @@ public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements return String.format("registryDesignation = '%s' and " + "registryInstrumentType in ('%s','%s') and " + "registryUnit = '%s' and " + - "registryStatus = '%s'" - , + "registryStatus = '%s'", RegistryDesignation.O.getKey(), RegistryInstrumentType.S.getKey(), RegistryInstrumentType.M.getKey(),