treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-497

Browse source
This commit is contained in:
akulikov 2023-11-09 14:59:11 +03:00
parent a2ebfd945b
commit e6ede79021
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSCommissionTradesReportBuilder.java
View file

@ -78,13 +78,14 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
ImdgPredicate finalPredicate = pb.and( ImdgPredicate finalPredicate = pb.and(
pb.sql(sql), pb.sql(sql),
pb.greatEqual("refundDate", nowDate), pb.greatEqual("refundDate", nowDate),
pb.less("valueDate", nowDate), pb.lessEqual("valueDate", nowDate),
pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey())) pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey())
); );
Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate); log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate);
rows = new ArrayList<>(registries.size()); rows = new ArrayList<>(registries.size());
for (Registry registry : registries) { for (Registry registry : registries) {
if (registry.getValueDate().equals(registry.getSettlementDate())) continue;
if (registry.getTradingDate() == null) { if (registry.getTradingDate() == null) {
log.warn("For registry id = {} field TradingDate was null, registry was skipped", log.warn("For registry id = {} field TradingDate was null, registry was skipped",
registry.getId()); registry.getId());

2
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/ReportServiceTest_BP.java
View file

@ -419,7 +419,7 @@ public class ReportServiceTest_BP {
File outFile = outFolder.listFiles()[0]; File outFile = outFolder.listFiles()[0];
File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv").getFile()); File expectedFile = new File(getClass().getClassLoader().getResource("expected_reports_csv/bp/KS_BR_PFX65_DEALS_expected.csv").getFile());
compareCSVFiles(expectedFile, outFile, List.of()); compareCSVFiles(expectedFile, outFile, List.of("TRADEDATE"));
testExecutionFond.setSessionId(oldExecutionFondSessionId); testExecutionFond.setSessionId(oldExecutionFondSessionId);
testExecutionFond.setCoverageStatus(oldExecutionFondCoverageStatus); testExecutionFond.setCoverageStatus(oldExecutionFondCoverageStatus);