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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-10-09 14:00:34 +03:00
commit 15f24ad82b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,13 +167,14 @@ public class KSRepLccTradesReportBuilder extends CSVReportBuilder<EmptyParams, K
if (account != null) { if (account != null) {
AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, account.getAccountType()); AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, account.getAccountType());
if (accountType == AccountType.Info) { if (accountType == AccountType.Info) {
String currency = account.getCurrency();
pb = accountImdg.predicateBuilder(); pb = accountImdg.predicateBuilder();
ImdgPredicate finalPredicate = pb.and( ImdgPredicate finalPredicate = pb.and(
pb.equals("accountType", AccountType.Anlt.getKey()), pb.equals("accountType", AccountType.Anlt.getKey()),
pb.equals("companyId", 5L) pb.equals("companyId", 5L)
); );
if (execution.getSecuritySymbol() != null) if (currency != null)
finalPredicate = pb.and(finalPredicate, pb.equals("currency", execution.getSecuritySymbol())); finalPredicate = pb.and(finalPredicate, pb.equals("currency", currency));
account = accountImdg.getFirstObjectByPredicate(finalPredicate); account = accountImdg.getFirstObjectByPredicate(finalPredicate);
} }
if (account != null) { if (account != null) {