From 6f04b155276961ba787c8c11cd6c5cd0b42b3c4a Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 6 Oct 2023 17:57:12 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-262 --- .../lim/exporter/services/MoneyExporterService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java index 5c54cf3db..f534a1827 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java @@ -20,8 +20,7 @@ import java.util.Collection; import java.util.List; import java.util.function.Function; -import static ru.spcex.platform.enumeration.RegistryTradingParams.AM_F; -import static ru.spcex.platform.enumeration.RegistryTradingParams.DM_T; +import static ru.spcex.platform.enumeration.RegistryTradingParams.*; @Service public class MoneyExporterService extends AbstractExporterService { @@ -57,11 +56,17 @@ public class MoneyExporterService extends AbstractExporterService { pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()), pb.equals("securityId", registry.getSecurityId()) ); - + Function prdctDM_I = registry -> pb.and( + pb.sql(RegistryCodeSqlBuilder.getInstance(DM_I).build()), + pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()), + pb.equals("securityId", registry.getSecurityId()), + pb.not(pb.equals("registryStatus", RegistryStatus.OK.getKey())) + ); for (Registry registry : registriesA) { if (checkNotBlocked(registry)) { BigDecimal sumPositive = BigDecimal.ZERO; if (registry.getTradingClearingRegistry() != null && registry.getSecurityId() != null) { + sumPositive = sumNegativeABS(registryImdg.getCollectionObjectsByPredicate(prdctDM_I.apply(registry))); sumPositive = sumPositive.add(sum(registryImdg.getCollectionObjectsByPredicate(prdctDM_T.apply(registry)))); } limFileRows.add(getRow(registry, sumPositive));