http://jira.mfd.msk:8088/browse/CLS-672 meta BankAccount POST/PUT

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountNewAction.java

@@ -47,6 +47,9 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
     @ApiModelProperty(value = "Компания", example = "1234")
     @JsonProperty
     private Long companyId;
+    @ApiModelProperty(value = "SWIFT", example = "ABCDE")
+    @JsonProperty
+    private String swiftCode;
 
     @Override
     public BankAccountNewRequest toRequest() {
@@ -61,6 +64,7 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
         req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode);
         req.setAccount(this.account);
         req.setCompanyId(this.companyId);
+        req.setSwiftCode(swiftCode);
         return req;
     }
 
@@ -149,4 +153,12 @@ public class BankAccountNewAction implements IAction<BankAccountNewRequest> {
     public void setCompanyId(Long companyId) {
         this.companyId = companyId;
     }
+
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
 }

clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/account/BankAccountUpdateAction.java

@@ -38,6 +38,9 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
     @ApiModelProperty(value = "Код причины постановки (КПП)", example = "01")
     @JsonProperty
     private String taxRegistrationReasonCode;
+    @ApiModelProperty(value = "SWIFT", example = "ABCDE")
+    @JsonProperty
+    private String swiftCode;
 
     @ApiModelProperty(value = "Номер счета", example = "11111222223333344444")
     private String account;
@@ -55,6 +58,7 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
         req.setTaxpayerIdentificationNumber(this.taxpayerIdentificationNumber);
         req.setTaxRegistrationReasonCode(this.taxRegistrationReasonCode);
         req.setAccount(this.account);
+        req.setSwiftCode(swiftCode);
         return req;
     }
 
@@ -143,4 +147,12 @@ public class BankAccountUpdateAction implements IAction<BankAccountUpdateRequest
     public void setAccount(String account) {
         this.account = account;
     }
+
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
 }

clearing-parent/backend-api/src/main/resources/meta/meta.json

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.11.0.86",
+		"version": "3.11.0.87",
 		
 		"enums": {
 		
@@ -5018,6 +5018,10 @@
 		{"code": "companyId",
 			"type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","visible": false
 		}
+	,
+		{"code": "swiftCode",
+			"type": 2,"length": 255,"shortname": "SWIFT"
+		}
 	]
 			}
 		,
@@ -5069,6 +5073,10 @@
 		{"code": "destination",
 			"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": false
 		}
+	,
+		{"code": "swiftCode",
+			"type": 2,"length": 255,"shortname": "SWIFT"
+		}
 	]
 			}
 		,
@@ -5865,6 +5873,10 @@
 		{"code": "debitLeg_accountId",
 			"type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "correspondentAccount"
 		}
+	,
+		{"code": "swiftCode",
+			"type": 2,"length": 255,"group": "Получатель","shortname": "SWIFT","enabled": false
+		}
 	]
 			}
 		,

clearing-parent/backend-api/src/main/resources/meta/meta.xml

@@ -1166,6 +1166,7 @@
 					<account type="2" length="50" name="Номер счета" shortname="Счет" required="true"/>
 					<destination type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" visible="false"/>
 					<companyId type="1" name="Компания" shortname="Компания" link="company" linkCode="shortName" visible="false"/>
+					<swiftCode type="2" length="255" shortname="SWIFT"/>
 				</post>
 				<put name="Изменение счета вывода средств из ПРЦ" confirmation="currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="bankAccount" linkCode="id" required="true"/>
@@ -1178,6 +1179,7 @@
 					<taxRegistrationReasonCode type="2" length="255" name="Код причины постановки (КПП)" shortname="КПП"/>
 					<account type="2" length="50" name="Номер счета" shortname="Счет"/>
 					<destination type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" visible="false"/>
+					<swiftCode type="2" length="255" shortname="SWIFT"/>
 				</put>
 				<delete name="Блокировка счета вывода средств из ПРЦ" confirmation="currency,bankIdentificationCode,correspondentAccount,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">
 					<id type="1" name="Идентификатор записи" shortname="ID" link="bankAccount" linkCode="id" required="true"/>

clearing-parent/backend-api/src/test/resources/meta.json

@@ -1,6 +1,6 @@
 
 		{
-		"version": "3.11.0.86",
+		"version": "3.11.0.87",
 		
 		"enums": {
 		
@@ -5018,6 +5018,10 @@
 		{"code": "companyId",
 			"type": 1,"name": "Компания","shortname": "Компания","link": "company","linkCode": "shortName","visible": false
 		}
+	,
+		{"code": "swiftCode",
+			"type": 2,"length": 255,"shortname": "SWIFT"
+		}
 	]
 			}
 		,
@@ -5069,6 +5073,10 @@
 		{"code": "destination",
 			"type": 2,"length": 255,"name": "Назначение платежа","shortname": "Назначение платежа","visible": false
 		}
+	,
+		{"code": "swiftCode",
+			"type": 2,"length": 255,"shortname": "SWIFT"
+		}
 	]
 			}
 		,
@@ -5865,6 +5873,10 @@
 		{"code": "debitLeg_accountId",
 			"type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "correspondentAccount"
 		}
+	,
+		{"code": "swiftCode",
+			"type": 2,"length": 255,"group": "Получатель","shortname": "SWIFT","enabled": false
+		}
 	]
 			}
 		,

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountNewRequest.java

@@ -25,6 +25,8 @@ public class BankAccountNewRequest {
     public String status;
     @JsonProperty
     public Long companyId;
+    @JsonProperty
+    public String swiftCode;
 
     public String getBankIdentificationCode() {
         return bankIdentificationCode;
@@ -113,4 +115,12 @@ public class BankAccountNewRequest {
     public void setCompanyId(Long companyId) {
         this.companyId = companyId;
     }
+
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
 }

platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/account/BankAccountUpdateRequest.java

@@ -23,6 +23,8 @@ public class BankAccountUpdateRequest {
     public String taxRegistrationReasonCode;//Код причины постановки (КПП)
     @JsonProperty
     public String account;//Номер счета
+    @JsonProperty
+    public String swiftCode;
 
     public Long getId() {
         return id;
@@ -103,4 +105,12 @@ public class BankAccountUpdateRequest {
     public void setAccount(String account) {
         this.account = account;
     }
+
+    public String getSwiftCode() {
+        return swiftCode;
+    }
+
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
 }