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