From cd920fbdf8e00ad92b418a748a7f57b8ca36a54b Mon Sep 17 00:00:00 2001 From: aalehin Date: Fri, 7 Jul 2023 15:59:33 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-280 --- fixup --- .../service/MoneyBalanceRegisterService.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java index a35ac2089..4e3b7ccc9 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -84,9 +84,9 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia private void insertMoneyBalanceRegister(Registry registry) { log.trace("Started generating MoneyBalanceRegister entity..."); MoneyBalanceRegister moneyBalanceRegister = new MoneyBalanceRegister(); - Registry registryForRemainderSum = registryMap.getSingleObjectBySQL(getSqlForRemainderSum()); - Registry registryForBlockedSum = registryMap.getSingleObjectBySQL(getSqlForBlockedSum()); - Registry registryForUnblockedSum = registryMap.getSingleObjectBySQL(getSqlForUnblockedSum()); + Registry registryForRemainderSum = registryMap.getSingleObjectBySQL(getSqlForRemainderSum(registry.getCompanyId())); + Registry registryForBlockedSum = registryMap.getSingleObjectBySQL(getSqlForBlockedSum(registry.getCompanyId())); + Registry registryForUnblockedSum = registryMap.getSingleObjectBySQL(getSqlForUnblockedSum(registry.getCompanyId())); Company company = companyMap.getSingleObjectByFieldValues(Map.of("id", 2L)); CompanySymbols companySymbol = companySymbolsMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId())); String setHouseName = company != null ? company.getShortName() : null; @@ -121,22 +121,22 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia private String getSqlForRegistries(Long companyId) { log.trace("Started generating sql predicate for registries..."); - return String.format("companyId = '%s' registryCode LIKE 'AM__'", companyId); + return String.format("companyId = '%s' and registryCode LIKE 'AM__'", companyId); } - private String getSqlForRemainderSum() { + private String getSqlForRemainderSum(Long companyId) { log.trace("Started generating sql predicate for registries remainder sum..."); - return "registryCode LIKE 'AM_T'"; + return String.format("companyId = '%s' and registryCode LIKE 'AM_T'", companyId); } - private String getSqlForBlockedSum() { + private String getSqlForBlockedSum(Long companyId) { log.trace("Started generating sql predicate for registries blocked sum..."); - return "registryCode LIKE 'AM_T'"; + return String.format("companyId = '%s' and registryCode LIKE 'AM_B'", companyId); } - private String getSqlForUnblockedSum() { + private String getSqlForUnblockedSum(Long companyId) { log.trace("Started generating sql predicate for registries unblocked sum..."); - return "registryCode LIKE 'AM_F'"; + return String.format("companyId = '%s' and registryCode LIKE 'AM_F'", companyId); } }