From 94af268598336e45d80c36ba289fd0a3d77f3a33 Mon Sep 17 00:00:00 2001 From: akulikov Date: Wed, 2 Aug 2023 13:34:45 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-358?focusedCommentId=55653&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-55653 --- .../reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java | 2 +- .../spcex/clearing/reports/services/ReportServiceTest_KS.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java index af8392d1f..e5f58fee1 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilder_INFTYPE_4.java @@ -34,7 +34,7 @@ public class ExecutedDealReportBuilder_INFTYPE_4 extends ExecutedDealReportBuild return executionFondImdg.getCollectionObjectsByPredicate( pb.and( pb.equals("coverageStatus", Allowed.DENIED.getKey()), - pb.lessEqual("settlementDate", LocalDate.now()) + pb.equals("settlementDate", LocalDate.now()) ) ); } diff --git a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java index 331ed5a2a..61e5f8933 100644 --- a/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java +++ b/clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_KS.java @@ -664,7 +664,7 @@ public class ReportServiceTest_KS { File outFile = outFolder.listFiles()[0]; File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/ks/KS_COMMISSION_TRADES_expected.csv").getFile()); - compareCSVFiles(expectedFile, outFile, Arrays.asList("SUM_DATE")); + compareCSVFiles(expectedFile, outFile, Arrays.asList("REPAYM_DATE")); registryImdg.delete(registry); registryImdg.delete(omtRegistry);