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

http://jira.mfd.msk:8088/browse/CLS-596 fix after review

Browse source
This commit is contained in:
akulikov 2023-11-22 15:19:41 +03:00
parent 8e948bc27a
commit 5639f9ff8b
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashNettoReportBuilder.java
View file

@ -124,24 +124,24 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder<SessionIdParam
sourceTkr = next.getTradingClearingRegistry(); sourceTkr = next.getTradingClearingRegistry();
} }
for (Registry currRegistry : cmtRegistries) { for (Registry currRegistry : cmtRegistries) {
if (!sourceTradingCode.equals(currRegistry.getTradingCode())) { if (!Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) {
invalid = true; invalid = true;
log.warn("Invalid CM_T registries set, tradingCode not equals. Registries was skipped"); log.warn("Invalid CM_T registries set, tradingCode not equals. Registries was skipped");
break; break;
} }
if (!sourceTkr.equals(currRegistry.getTradingClearingRegistry())) { if (!Objects.equals(sourceTkr, currRegistry.getTradingClearingRegistry())) {
invalid = true; invalid = true;
log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped"); log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
break; break;
} }
} }
for (Registry currRegistry : lmtRegistries) { for (Registry currRegistry : lmtRegistries) {
if (!sourceTradingCode.equals(currRegistry.getTradingCode())) { if (!Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) {
invalid = true; invalid = true;
log.warn("Invalid LM_T registries set, tradingCode not equals. Registries was skipped"); log.warn("Invalid LM_T registries set, tradingCode not equals. Registries was skipped");
break; break;
} }
if (!sourceTkr.equals(currRegistry.getTradingClearingRegistry())) { if (!Objects.equals(sourceTkr, currRegistry.getTradingClearingRegistry())) {
invalid = true; invalid = true;
log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped"); log.warn("Invalid CM_T registries set, tradingClearingRegistry not equals. Registries was skipped");
break; break;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegisterSumsReportBuilder.java
View file

@ -110,7 +110,7 @@ public class KSRepCashRegisterSumsReportBuilder extends CSVReportBuilder<EmptyPa
pairRegistry.getId()); pairRegistry.getId());
} }
String account = ""; String account = null;
AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType()); AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType());
if (accountType == AccountType.Clrn) { if (accountType == AccountType.Clrn) {
account = registry.getAccount(); account = registry.getAccount();

9
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepDepoNettoReportBuilder.java
View file

@ -20,10 +20,7 @@ import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component @Component
@ -113,13 +110,13 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder<SessionIdParam
if (!cstRegistries.isEmpty()) sourceTradingCode = cstRegistries.iterator().next().getTradingCode(); if (!cstRegistries.isEmpty()) sourceTradingCode = cstRegistries.iterator().next().getTradingCode();
if (!lstRegistries.isEmpty()) sourceTradingCode = lstRegistries.iterator().next().getTradingCode(); if (!lstRegistries.isEmpty()) sourceTradingCode = lstRegistries.iterator().next().getTradingCode();
for (Registry currRegistry : cstRegistries) { for (Registry currRegistry : cstRegistries) {
if (sourceTradingCode.equals(currRegistry.getTradingCode())) continue; if (Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) continue;
invalid = true; invalid = true;
log.warn("Invalid CS_T registries set, tradingCode not equals. Registries was skipped"); log.warn("Invalid CS_T registries set, tradingCode not equals. Registries was skipped");
break; break;
} }
for (Registry currRegistry : lstRegistries) { for (Registry currRegistry : lstRegistries) {
if (sourceTradingCode.equals(currRegistry.getTradingCode())) continue; if (Objects.equals(sourceTradingCode, currRegistry.getTradingCode())) continue;
invalid = true; invalid = true;
log.warn("Invalid LS_T registries set, tradingCode not equals. Registries was skipped"); log.warn("Invalid LS_T registries set, tradingCode not equals. Registries was skipped");
break; break;

2
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
View file

@ -156,7 +156,7 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
ksRepTradesReport.setTkr(tkr.getCode()); ksRepTradesReport.setTkr(tkr.getCode());
String account = ""; String account = null;
if (tkr.getMoneyAccountId() != null) { if (tkr.getMoneyAccountId() != null) {
Account moneyAccountFromImdg = accountImdg.getSingleObjectByID(tkr.getMoneyAccountId()); Account moneyAccountFromImdg = accountImdg.getSingleObjectByID(tkr.getMoneyAccountId());
if (moneyAccountFromImdg != null) { if (moneyAccountFromImdg != null) {