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

reports-service http://jira.mfd.msk:8088/browse/CLS-497 правки

Browse source
This commit is contained in:
AKurakin 2023-09-22 17:54:32 +03:00
parent ea0b8a74dd
commit 633f34ee51
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
pb.sql(sql), pb.sql(sql),
pb.equals("refundDate", nowDate), pb.equals("refundDate", nowDate),
pb.less("valueDate", nowDate), pb.less("valueDate", nowDate),
pb.or(pb.equals("registryStatus", RegistryStatus.OK.getKey()), pb.equals("registryStatus", RegistryStatus.CLRD.getKey())), pb.equals("registryStatus", RegistryStatus.CLRD.getKey()),
pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey())) pb.or(pb.equals("sessionType", SessionType.XDEP.getKey()), pb.equals("sessionType", SessionType.FINL.getKey()))
); );
Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate); Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
@ -103,7 +103,10 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
registry.getCompanyId()); registry.getCompanyId());
continue; continue;
} }
if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue; if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) {
log.debug("Company not active, registry[{}] skip.", registry.getId());
continue;
}
String firmId = ""; String firmId = "";
String firmIdInitiator = ""; String firmIdInitiator = "";
@ -122,21 +125,20 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
} }
} }
sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.OM_T).build(); // sql = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams.OM_T).build();
Registry omtRegistry = registryImdg.getFirstObjectByPredicate( // Registry omtRegistry = registryImdg.getFirstObjectByPredicate(
pb.and( // pb.and(
pb.sql(sql), // pb.sql(sql),
pb.equals("contract", registry.getContract()), // pb.equals("contract", registry.getContract()),
pb.notNull("groupId") // pb.notNull("groupId")
) // )
); // );
if (omtRegistry == null) { // if (omtRegistry == null) {
log.warn("Can't find pair OM_T registry for contract = {}. Registry id = {} skipped", // log.warn("Can't find pair OM_T registry for contract = {}. Registry id = {} skipped",
registry.getContract(), // registry.getContract(),
registry.getId()); // registry.getId());
continue; // continue;
} // }
// String tradeNum = extractPartAgreementNumber(String.valueOf(omtRegistry.getGroupId())); // String tradeNum = extractPartAgreementNumber(String.valueOf(omtRegistry.getGroupId()));
// if (tradeNum == null) { // if (tradeNum == null) {
// log.warn("Can't extract TradeNum from GroupId (groupId = {} for OM_T registry id = {}). " + // log.warn("Can't extract TradeNum from GroupId (groupId = {} for OM_T registry id = {}). " +