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

http://jira.mfd.msk:8088/browse/CLS-280

Browse source 
---
fixup
This commit is contained in:
aalehin 2023-07-07 18:07:22 +03:00
parent 274e967888
commit 7a0bbb9bce
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java
View file

@ -84,9 +84,9 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
private void insertMoneyBalanceRegister(Registry registry) { private void insertMoneyBalanceRegister(Registry registry) {
log.trace("Started generating MoneyBalanceRegister entity..."); log.trace("Started generating MoneyBalanceRegister entity...");
MoneyBalanceRegister moneyBalanceRegister = new MoneyBalanceRegister(); MoneyBalanceRegister moneyBalanceRegister = new MoneyBalanceRegister();
Registry registryForRemainderSum = registryMap.getSingleObjectBySQL(getSqlForRemainderSum(registry.getCompanyId())); Registry registryForRemainderSum = registryMap.getSingleObjectBySQL(getSqlForRemainderSum(registry.getCompanyId(), registry.getAccount()));
Registry registryForBlockedSum = registryMap.getSingleObjectBySQL(getSqlForBlockedSum(registry.getCompanyId())); Registry registryForBlockedSum = registryMap.getSingleObjectBySQL(getSqlForBlockedSum(registry.getCompanyId(), registry.getAccount()));
Registry registryForUnblockedSum = registryMap.getSingleObjectBySQL(getSqlForUnblockedSum(registry.getCompanyId())); Registry registryForUnblockedSum = registryMap.getSingleObjectBySQL(getSqlForUnblockedSum(registry.getCompanyId(), registry.getAccount()));
Company company = companyMap.getSingleObjectByFieldValues(Map.of("id", 2L)); Company company = companyMap.getSingleObjectByFieldValues(Map.of("id", 2L));
CompanySymbols companySymbol = companySymbolsMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId())); CompanySymbols companySymbol = companySymbolsMap.getSingleObjectByFieldValues(Map.of("companyId", registry.getCompanyId()));
String setHouseName = company != null ? company.getShortName() : null; String setHouseName = company != null ? company.getShortName() : null;
@ -124,19 +124,19 @@ public class MoneyBalanceRegisterService extends QueueConsumer implements Initia
return String.format("companyId = '%s' and registryCode LIKE 'AM__'", companyId); return String.format("companyId = '%s' and registryCode LIKE 'AM__'", companyId);
} }
private String getSqlForRemainderSum(Long companyId) { private String getSqlForRemainderSum(Long companyId, String account) {
log.trace("Started generating sql predicate for registries remainder sum..."); log.trace("Started generating sql predicate for registries remainder sum...");
return String.format("companyId = '%s' and registryCode LIKE 'AM_T'", companyId); return String.format("companyId = '%s' and account = '%s' and registryCode LIKE 'AM_T'", companyId);
} }
private String getSqlForBlockedSum(Long companyId) { private String getSqlForBlockedSum(Long companyId, String account) {
log.trace("Started generating sql predicate for registries blocked sum..."); log.trace("Started generating sql predicate for registries blocked sum...");
return String.format("companyId = '%s' and registryCode LIKE 'AM_B'", companyId); return String.format("companyId = '%s' and account = '%s' and registryCode LIKE 'AM_B'", companyId);
} }
private String getSqlForUnblockedSum(Long companyId) { private String getSqlForUnblockedSum(Long companyId, String account) {
log.trace("Started generating sql predicate for registries unblocked sum..."); log.trace("Started generating sql predicate for registries unblocked sum...");
return String.format("companyId = '%s' and registryCode LIKE 'AM_F'", companyId); return String.format("companyId = '%s' and account = '%s' and registryCode LIKE 'AM_F'", companyId);
} }
} }