diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java index c46b1de32..27b840287 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/ValidationConfig.java @@ -202,7 +202,7 @@ public class ValidationConfig { Sdf01NewValidationRule.CompanyPresent, Sdf01NewValidationRule.AccountType, Sdf01NewValidationRule.AccountPresent, - Sdf01NewValidationRule.CurrencyCode, + Sdf01NewValidationRule.CurrencyCodeCheck, Sdf01NewValidationRule.DatIsCurrentDt ); }; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java index 37022f69b..342dc084a 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf01NewValidationRule.java @@ -7,6 +7,7 @@ import ru.spcex.clearing.error.ClearingError; import ru.spcex.clearing.error.ClearingErrorInternal; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.platform.enumeration.AccType; +import ru.spcex.platform.enumeration.CurrencyCode; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.validation.ImdgValidationContext; import ru.spcex.platform.utils.enumeration.EnumMessage; @@ -59,11 +60,11 @@ public enum Sdf01NewValidationRule implements IValidationRule validate(ImdgValidationContext context) { SDf01 sdf01 = context.getValidatedObject(); - if (!ru.spcex.platform.enumeration.CurrencyCode.RUR.equalsByKey(sdf01.getCurr_code())) { + if (!IEnumKey.contains(sdf01.getCurr_code(), CurrencyCode.class)) { return of(ClearingError.CurrencyNotFound, sdf01.getCurr_code()); } return empty(); diff --git a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java index 7bf725710..981f8694f 100644 --- a/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java +++ b/platform-parent/platform-utils/src/main/java/ru/spcex/platform/utils/enumeration/IEnumKey.java @@ -34,7 +34,7 @@ public interface IEnumKey extends Serializable { * Проверяет что среди всех Enum данного класса, присутствует элемент с данным id * id может быть null */ - static & IEnumKey> boolean contains(Class enumClass, String key) { + static & IEnumKey> boolean contains(String key, Class enumClass) { for (T e : enumClass.getEnumConstants()) { if (Objects.equals(key, e.getKey())) return true;