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

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

Browse source
This commit is contained in:
ialbert 2025-06-24 14:07:56 +03:00
parent c6b644d118
commit 7ba559ad40
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsV2.java
View file

@ -357,12 +357,14 @@ public class InspectionObligationsV2 implements ISessionStage {
return Collections.emptyList(); return Collections.emptyList();
} }
ImdgPredicateBuilder pb = registryImdg.predicateBuilder(); ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
String groupMarket = groupIdAndSettleDate.get().getFirst().market();
ImdgPredicate marketCondition = StringUtils.hasText(groupMarket) ?
pb.or(pb.equals("market", groupMarket), pb.isNull("market")) : pb.alwaysTrue();
return registryImdg.getCollectionObjectsByPredicate( return registryImdg.getCollectionObjectsByPredicate(
pb.and( pb.and(
pb.and( pb.and(
pb.equals("groupId", groupIdAndSettleDate.get().getFirst().groupId()), pb.equals("groupId", groupIdAndSettleDate.get().getFirst().groupId()),
StringUtils.hasText(groupIdAndSettleDate.get().getFirst().market()) ? marketCondition
pb.equals("market", groupIdAndSettleDate.get().getFirst().market()) : pb.alwaysTrue()
), ),
pb.not(pb.equals("settlementDate", groupIdAndSettleDate.get().getSecond())) pb.not(pb.equals("settlementDate", groupIdAndSettleDate.get().getSecond()))
) )

3
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/RequirementsAndObligationCreation.java
View file

@ -15,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.account.Account;
import ru.clearing.classes.statics.data.account.ClearingAccount; import ru.clearing.classes.statics.data.account.ClearingAccount;
import ru.clearing.classes.statics.data.account.DepoAccount; import ru.clearing.classes.statics.data.account.DepoAccount;
@ -412,7 +411,7 @@ public class RequirementsAndObligationCreation implements ISessionStage {
pb.equals("settlementDate", settlementDt), pb.equals("settlementDate", settlementDt),
pb.equals("sessionId", sessionId), pb.equals("sessionId", sessionId),
pb.equals("groupId", exchangeExecutionId), pb.equals("groupId", exchangeExecutionId),
StringUtils.hasText(market) ? pb.equals("market", market) : pb.alwaysTrue() pb.or(pb.equals("market", market), pb.isNull("market"))
); );
Registry rgs = registryImdg.getSingleObjectByPredicate(rgstrPredicate); Registry rgs = registryImdg.getSingleObjectByPredicate(rgstrPredicate);
log.trace("rgs.id={} found by: {}", rgs == null ? "'not found'" : rgs.getId(), rgstrPredicate.toString()); log.trace("rgs.id={} found by: {}", rgs == null ? "'not found'" : rgs.getId(), rgstrPredicate.toString());