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 3eea0d108..5c54cf3db 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,7 +20,8 @@ import java.util.Collection; import java.util.List; import java.util.function.Function; -import static ru.spcex.platform.enumeration.RegistryTradingParams.*; +import static ru.spcex.platform.enumeration.RegistryTradingParams.AM_F; +import static ru.spcex.platform.enumeration.RegistryTradingParams.DM_T; @Service public class MoneyExporterService extends AbstractExporterService { @@ -56,17 +57,11 @@ 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()) - ); 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)); diff --git a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java index dd29158b7..c07474bf5 100644 --- a/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java +++ b/clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.function.Function; import static ru.spcex.platform.enumeration.RegistryTradingParams.AS_F; -import static ru.spcex.platform.enumeration.RegistryTradingParams.DS_I; +import static ru.spcex.platform.enumeration.RegistryTradingParams.DS_T; @Service public class SecurityExporterService extends AbstractExporterService { @@ -50,7 +50,7 @@ public class SecurityExporterService extends AbstractExporterService { ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); Function prdct = registry -> pb.and( - pb.sql(RegistryCodeSqlBuilder.getInstance(DS_I).build()), + pb.sql(RegistryCodeSqlBuilder.getInstance(DS_T).build()), pb.equals("registryStatus", RegistryStatus.PROC.getKey()), pb.equals("companyId", registry.getCompanyId()), pb.equals("tradingClearingRegistry", registry.getTradingClearingRegistry()), diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java index 42c07d279..17f5b71e1 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/RegistryTradingParams.java @@ -92,6 +92,7 @@ public record RegistryTradingParams(RegistryDesignation registryDesignation, public final static RegistryTradingParams A__T; public final static RegistryTradingParams AS_T; public final static RegistryTradingParams DS_I; + public final static RegistryTradingParams DS_T; public final static RegistryTradingParams AS_B; public final static RegistryTradingParams AS_F; public final static RegistryTradingParams CM_T; @@ -227,6 +228,10 @@ public record RegistryTradingParams(RegistryDesignation registryDesignation, RegistryInstrumentType.S, null, RegistryUnit.I); + DS_T = new RegistryTradingParams(RegistryDesignation.D, + RegistryInstrumentType.S, + null, + RegistryUnit.T); D__I = new RegistryTradingParams(RegistryDesignation.D, null, null,