diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java index 4e039a019..0f0dcf8c8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyInfoBackendGetFields.java @@ -1,9 +1,14 @@ package ru.spcex.clearing.backendapi.controller.response.entity.company; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.profile.CompanyInfo; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class CompanyInfoBackendGetFields { @JsonProperty @@ -57,6 +62,14 @@ public class CompanyInfoBackendGetFields { @JsonProperty @ApiModelProperty(value = "Наименование статуса") private String workflowStatus; + @JsonProperty + @ApiModelProperty(value = "Номер") + private String taxNumber; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + @ApiModelProperty(value = "Дата регистрации") + private LocalDate registrationDate; public Long getId() { return id; @@ -194,6 +207,22 @@ public class CompanyInfoBackendGetFields { this.workflowStatus = workflowStatus; } + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public LocalDate getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(LocalDate registrationDate) { + this.registrationDate = registrationDate; + } + public static CompanyInfoBackendGetFields fromEntity(Company company) { if (company == null || company.getProfile() == null) { return null; @@ -211,6 +240,8 @@ public class CompanyInfoBackendGetFields { fields.setResidence(info.getResidence()); fields.setShortNameEng(info.getShortNameEng()); fields.setFullNameEng(info.getFullNameEng()); + fields.setTaxNumber(info.getTaxNumber()); + fields.setRegistrationDate(info.getRegistrationDate()); fields.setShortName(company.getShortName()); fields.setFullName(company.getFullName()); diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java index 23c1c7268..b465ec317 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/company/CompanyInfoUpdateRequest.java @@ -1,7 +1,11 @@ package ru.spcex.clearing.platform.messaging.domain.cud.company; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.time.LocalDate; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; public class CompanyInfoUpdateRequest { @JsonProperty @@ -33,6 +37,8 @@ public class CompanyInfoUpdateRequest { private String workflowStatus; @JsonProperty private String taxNumber; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty private LocalDate registrationDate;