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

balance-service sfd09 поправил поиск по inn

Browse source
This commit is contained in:
AKurakin 2023-01-13 17:21:56 +03:00
parent 565ea49cdb
commit 5b529484a5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf01ValidationRule.java
View file

@ -58,7 +58,6 @@ public enum Sdf01ValidationRule implements IValidationRule<ImdgValidationContext
@Override @Override
public Optional<EnumMessage> validate(ImdgValidationContext<SDf01> context) { public Optional<EnumMessage> validate(ImdgValidationContext<SDf01> context) {
SDf01 sdf01 = context.getValidatedObject(); SDf01 sdf01 = context.getValidatedObject();
//fixme string format???
if (!LocalDate.now().equals(LocalDate.parse(sdf01.getDat(), datFormatter))) { if (!LocalDate.now().equals(LocalDate.parse(sdf01.getDat(), datFormatter))) {
return of(BalanceError.CurrentDateOnly); return of(BalanceError.CurrentDateOnly);
} }

10
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java
View file

@ -13,6 +13,7 @@ import ru.spcex.platform.imdg.validation.ImdgValidationContext;
import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.validation.IValidationRule; import ru.spcex.platform.utils.validation.IValidationRule;
import java.math.RoundingMode;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -23,11 +24,14 @@ public enum Sdf09ValidationRule implements IValidationRule<ImdgValidationContext
SDf09 sdf09 = context.getValidatedObject(); SDf09 sdf09 = context.getValidatedObject();
Imdg<CompanySymbols> companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg<CompanySymbols> companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class);
String innStr = sdf09.getInn().setScale(0, RoundingMode.DOWN).toString();
CompanySymbols symbol = companySymbolImdg CompanySymbols symbol = companySymbolImdg
.getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(), .getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(),
"companySymbolValue", sdf09.getInn())); "companySymbolValue", innStr));
Company company = companyImdg.getSingleObjectByID(symbol.getCompanyId()); Company company = null;
if (symbol != null) {
company = companyImdg.getSingleObjectByID(symbol.getCompanyId());
}
if (company == null) { if (company == null) {
return of( BalanceError.CompanyNotFound); return of( BalanceError.CompanyNotFound);
} }