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

sdf57 executor clearing-service

Browse source
This commit is contained in:
ialbert 2023-05-31 13:16:17 +03:00
parent 2527755afc
commit f52f5fe304
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf57Executor.java
View file

@ -343,13 +343,14 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
private Optional<Registry> findRegByDesignation(Statement s, RegistryDesignation des) { private Optional<Registry> findRegByDesignation(Statement s, RegistryDesignation des) {
RegistryTradingParams p = new RegistryTradingParams( RegistryTradingParams p = new RegistryTradingParams(
des, RegistryInstrumentType.M, RegistryCapacity.A, RegistryUnit.T des, RegistryInstrumentType.M, null, RegistryUnit.T
); );
String sql = RegistryCodeSqlBuilder.getInstance(p).build(); String sql = RegistryCodeSqlBuilder.getInstance(p).build();
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
ImdgPredicate rgstrPredicate = pb.and(pb.sql(sql), ImdgPredicate rgstrPredicate = pb.and(pb.sql(sql),
pb.sql(sql), pb.sql(sql),
pb.equals("companyId", s.getAddresseeId()) //fixme companyId? pb.equals("companyId", s.getAddresseeId()),
pb.equals("accountId", s.getAccountId())
); );
if (des.equals(RegistryDesignation.D) && !TextUtil.isEmpty(s.getContract())) { if (des.equals(RegistryDesignation.D) && !TextUtil.isEmpty(s.getContract())) {
rgstrPredicate = pb.and(rgstrPredicate, pb.equals("contract", s.getContract())); rgstrPredicate = pb.and(rgstrPredicate, pb.equals("contract", s.getContract()));