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

SDF21 добавил условие на поиск регистра по securityId

Browse source 
swt-importer фикс поля 35B/83D
This commit is contained in:
ialbert 2023-08-08 21:43:11 +03:00
parent f00cf0ee3b
commit 475c3f99ac
2 changed files with 6 additions and 1 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/service/executors/Sdf21Executor.java
View file

@ -154,6 +154,7 @@ public class Sdf21Executor extends AbstractExecutor<SDf21> {
.rgsCode(RegistryTradingParams.AS_T) .rgsCode(RegistryTradingParams.AS_T)
.companyId(company.getId()) //раньше было stmt.getAddresseeId() .companyId(company.getId()) //раньше было stmt.getAddresseeId()
.accountId(account.getId()) //раньше было stmt.getAccountId() .accountId(account.getId()) //раньше было stmt.getAccountId()
.securityId(stmt.getSecurityId())
.find(); .find();
astFound.ifPresentOrElse(rgs -> { astFound.ifPresentOrElse(rgs -> {
log.debug("stmt.id={}, found AS*T.id={}, updating...", stmt.getId(), rgs.getId()); log.debug("stmt.id={}, found AS*T.id={}, updating...", stmt.getId(), rgs.getId());
@ -368,6 +369,11 @@ public class Sdf21Executor extends AbstractExecutor<SDf21> {
return this; return this;
} }
private RegistrySearch securityId(Long securityId) {
predicate = pb.and(predicate, pb.equals("securityId", securityId));
return this;
}
private RegistrySearch status() { private RegistrySearch status() {
predicate = pb.and(predicate, pb.or( predicate = pb.and(predicate, pb.or(
pb.equals("registryStatus", RegistryStatus.PROC.getKey()), pb.equals("registryStatus", RegistryStatus.PROC.getKey()),

1
clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/data/enums/ReadingPatterns.java
View file

@ -178,7 +178,6 @@ public enum ReadingPatterns {
public void reed(String line, SWTRecord record) { public void reed(String line, SWTRecord record) {
String[] cells = getValueWitoutKey(line, ":83D:").split(":"); String[] cells = getValueWitoutKey(line, ":83D:").split(":");
cells = Arrays.copyOf(cells, 3); cells = Arrays.copyOf(cells, 3);
record.setValFor35BTag(cells);
record.setValFor83DTag(cells); record.setValFor83DTag(cells);
} }
}, },