diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java index 1901d631a..85d247f61 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepCashNettoReportBuilder.java @@ -67,11 +67,13 @@ public class KSRepCashNettoReportBuilder extends CSVReportBuilder sessionIds = params.getSessionId(); - if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg); ImdgPredicate finalPredicate = pb.and( - pb.in("sessionId", sessionIds.toArray(new Long[0])), - pb.equals("clearingDate", nowDate), + pb.not(pb.in("registryStatus", + RegistryStatus.CLRD.getKey(), + RegistryStatus.UNCV.getKey(), + RegistryStatus.FAIL.getKey(), + RegistryStatus.NACK.getKey(), + RegistryStatus.NACC.getKey())), pb.sql(sql), pb.or( pb.equals("accountType", AccountType.Clrn.getKey()), diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java index 1e33b4e51..755df29a6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/ks/KSRepDepoNettoReportBuilder.java @@ -66,12 +66,14 @@ public class KSRepDepoNettoReportBuilder extends CSVReportBuilder sessionIds = params.getSessionId(); - if (sessionIds == null || sessionIds.isEmpty()) sessionIds = getSessionIdsForCurrentDate(sessionImdg); String sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.TS_T, RegistryTradingParams.OS_T).build(); ImdgPredicate finalPredicate = pb.and( - pb.in("sessionId", sessionIds.toArray(new Long[0])), - pb.equals("clearingDate", nowDate), + pb.not(pb.in("registryStatus", + RegistryStatus.CLRD.getKey(), + RegistryStatus.UNCV.getKey(), + RegistryStatus.FAIL.getKey(), + RegistryStatus.NACK.getKey(), + RegistryStatus.NACC.getKey())), pb.sql(sql), pb.equals("accountType", AccountType.Depo.getKey()), pb.notNull("account")