diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetAll.java index 0c57a4546..540ec350e 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetAll.java @@ -57,7 +57,6 @@ public class BankAccountBackendGetAll extends BasicSpcexResponse { singleItem.setSwiftCode(bankAccount.getSwiftCode()); singleItem.setTaxpayerIdentificationNumber(bankAccount.getTaxpayerIdentificationNumber()); singleItem.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode()); - singleItem.setAccount(bankAccount.getAccount()); payload.getItems().add(singleItem); } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetById.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetById.java index 3877324bd..3054ae468 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetById.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/account/BankAccountBackendGetById.java @@ -42,7 +42,6 @@ public class BankAccountBackendGetById extends BasicSpcexResponse { payload.setSwiftCode(bankAccount.getSwiftCode()); payload.setTaxpayerIdentificationNumber(bankAccount.getTaxpayerIdentificationNumber()); payload.setTaxRegistrationReasonCode(bankAccount.getTaxRegistrationReasonCode()); - payload.setAccount(bankAccount.getAccount()); } } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java index b908a26a2..1b3eb83f4 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/BankAccountHistoryMapStore.java @@ -27,7 +27,7 @@ public class BankAccountHistoryMapStore extends TemplateEventMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE", "ACCOUNT" + "ID", "ACCOUNT_ID", "BANK_IDENTIFICATION_CODE", "BANK_NAME", "CORRESPONDENT_ACCOUNT", "CORRESPONDENT_ACCOUNT_NAME", "CURRENCY", "DESTINATION", "IBAN", "INTERNATIONAL_TRANSFER_SIGN", "SWIFT_CODE", "TAXPAYER_IDENTIFICATION_NUMBER", "TAX_REGISTRATION_REASON_CODE" }; } @@ -49,7 +49,6 @@ public class BankAccountMapStore extends TemplateMapStore { object.setSwiftCode(resultSet.getObject("SWIFT_CODE", String.class)); object.setTaxpayerIdentificationNumber(resultSet.getObject("TAXPAYER_IDENTIFICATION_NUMBER", String.class)); object.setTaxRegistrationReasonCode(resultSet.getObject("TAX_REGISTRATION_REASON_CODE", String.class)); - object.setAccount(resultSet.getObject("ACCOUNT", String.class)); return object; } @@ -68,8 +67,7 @@ public class BankAccountMapStore extends TemplateMapStore { object.getInternationalTransferSign(), object.getSwiftCode(), object.getTaxpayerIdentificationNumber(), - object.getTaxRegistrationReasonCode(), - object.getAccount() + object.getTaxRegistrationReasonCode() }; return args; }