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

Merge branch '10_01_2024_hotfix' into dev

Browse source
This commit is contained in:
ialbert 2024-01-30 17:54:10 +03:00
commit d4285494af
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/RegistryManager.java
View file

@ -38,11 +38,17 @@ public class RegistryManager {
public Optional<Registry> searchDmxByCounterParty(Registry rgs) { public Optional<Registry> searchDmxByCounterParty(Registry rgs) {
if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty(); if (TextUtil.isEmpty(rgs.getContract())) return Optional.empty();
String sqlCondition = String.format("(%s) and companyId = %d and contract = '%s'", ImdgPredicateBuilder pb = rgsImdg.predicateBuilder();
RegistryCodeSqlBuilder.getInstance(DM_X).build(), ImdgPredicate prdct = pb.and(
rgs.getCounterPartyId(), pb.sql(RegistryCodeSqlBuilder.getInstance(DM_X).build()),
rgs.getContract()); pb.equals("companyId", rgs.getCounterPartyId()),
Registry dmx = rgsImdg.getFirstObjectBySQL(sqlCondition); pb.equals("contract", rgs.getContract()),
pb.or(
pb.equals("registryStatus", RegistryStatus.PROC.getKey()),
pb.equals("registryStatus", RegistryStatus.MNG.getKey())
)
);
Registry dmx = rgsImdg.getFirstObjectByPredicate(prdct);
return Optional.ofNullable(dmx); return Optional.ofNullable(dmx);
} }