diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java index 59ee43b96..0c6948dbc 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java @@ -51,26 +51,22 @@ public class CompanyBackendGetAll extends BasicSpcexResponse { singleItem.setFullName(company.getFullName()); singleItem.setCreated(company.getCreated()); singleItem.setUpdated(company.getUpdated()); - CompanyBackendGetFields.CompanyInfoFields companyInfoFields = new CompanyBackendGetFields.CompanyInfoFields(); CompanyInfo profile = company.getProfile(); if (profile != null) { - companyInfoFields.setId(profile.getId()); - companyInfoFields.setCompanyId(profile.getCompanyId()); - companyInfoFields.setCorporationSoleType(profile.getCorporationSoleType()); - companyInfoFields.setCountryCode(profile.getCountryCode()); - companyInfoFields.setDescription(profile.getDescription()); - companyInfoFields.setProfessionalSign(profile.getProfessionalSign()); - companyInfoFields.setLegalKind(profile.getLegalKind()); - companyInfoFields.setOrganizationType(profile.getOrganizationType()); - companyInfoFields.setResidence(profile.getResidence()); - companyInfoFields.setShortName(profile.getShortName()); - companyInfoFields.setFullName(profile.getFullName()); - companyInfoFields.setShortNameEng(profile.getShortNameEng()); - companyInfoFields.setFullNameEng(profile.getFullNameEng()); - companyInfoFields.setTradingCode(profile.getTradingCode()); - companyInfoFields.setClearingCode(profile.getClearingCode()); - companyInfoFields.setRegistrationCode(profile.getRegistrationCode()); - singleItem.setProfile(companyInfoFields); + singleItem.setCorporationSoleType(profile.getCorporationSoleType()); + singleItem.setCountryCode(profile.getCountryCode()); + singleItem.setDescription(profile.getDescription()); + singleItem.setProfessionalSign(profile.getProfessionalSign()); + singleItem.setLegalKind(profile.getLegalKind()); + singleItem.setOrganizationType(profile.getOrganizationType()); + singleItem.setResidence(profile.getResidence()); + singleItem.setShortName(profile.getShortName()); + singleItem.setFullName(profile.getFullName()); + singleItem.setShortNameEng(profile.getShortNameEng()); + singleItem.setFullNameEng(profile.getFullNameEng()); + singleItem.setTradingCode(profile.getTradingCode()); + singleItem.setClearingCode(profile.getClearingCode()); + singleItem.setRegistrationCode(profile.getRegistrationCode()); } payload.getItems().add(singleItem); } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java index b07140d91..97b4fb072 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java @@ -28,7 +28,25 @@ public class CompanyBackendGetFields { @JsonProperty private Instant updated; @JsonProperty - private CompanyInfoFields profile; + private String clearingMemberCategory; // ref CHAR(4), + @JsonProperty + private String corporationSoleType; // ref CHAR(4), + @JsonProperty + private String countryCode; //ref CHAR(4), + @JsonProperty + private String description; + @JsonProperty + private String professionalSign; // ref CHAR(4), + @JsonProperty + private String legalKind; // ref CHAR(4), + @JsonProperty + private String organizationType; // ref CHAR(4), + @JsonProperty + private String residence; // ref CHAR(4), + @JsonProperty + private String shortNameEng; + @JsonProperty + private String fullNameEng; public Long getId() { return id; @@ -102,184 +120,256 @@ public class CompanyBackendGetFields { this.updated = updated; } - public CompanyInfoFields getProfile() { - return profile; + public String getClearingMemberCategory() { + return clearingMemberCategory; } - public void setProfile(CompanyInfoFields profile) { - this.profile = profile; + public void setClearingMemberCategory(String clearingMemberCategory) { + this.clearingMemberCategory = clearingMemberCategory; } - static class CompanyInfoFields { - @JsonProperty - private Long id; - @JsonProperty - private Long companyId; // Company.CompanyInfo.companyId = CompanyInfo.id - @JsonProperty - private String clearingMemberCategory; // ref CHAR(4), - @JsonProperty - private String corporationSoleType; // ref CHAR(4), - @JsonProperty - private String countryCode; //ref CHAR(4), - @JsonProperty - private String description; - @JsonProperty - private String professionalSign; // ref CHAR(4), - @JsonProperty - private String legalKind; // ref CHAR(4), - @JsonProperty - private String organizationType; // ref CHAR(4), - @JsonProperty - private String residence; // ref CHAR(4), - @JsonProperty - private String shortName; - @JsonProperty - private String fullName; - @JsonProperty - private String shortNameEng; - @JsonProperty - private String fullNameEng; - @JsonProperty - private String tradingCode; - @JsonProperty - private String clearingCode; - @JsonProperty - private String registrationCode; - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public String getClearingMemberCategory() { - return clearingMemberCategory; - } - - public void setClearingMemberCategory(String clearingMemberCategory) { - this.clearingMemberCategory = clearingMemberCategory; - } - - public String getCorporationSoleType() { - return corporationSoleType; - } - - public void setCorporationSoleType(String corporationSoleType) { - this.corporationSoleType = corporationSoleType; - } - - public String getCountryCode() { - return countryCode; - } - - public void setCountryCode(String countryCode) { - this.countryCode = countryCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getProfessionalSign() { - return professionalSign; - } - - public void setProfessionalSign(String professionalSign) { - this.professionalSign = professionalSign; - } - - public String getLegalKind() { - return legalKind; - } - - public void setLegalKind(String legalKind) { - this.legalKind = legalKind; - } - - public String getOrganizationType() { - return organizationType; - } - - public void setOrganizationType(String organizationType) { - this.organizationType = organizationType; - } - - public String getResidence() { - return residence; - } - - public void setResidence(String residence) { - this.residence = residence; - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getShortNameEng() { - return shortNameEng; - } - - public void setShortNameEng(String shortNameEng) { - this.shortNameEng = shortNameEng; - } - - public String getFullNameEng() { - return fullNameEng; - } - - public void setFullNameEng(String fullNameEng) { - this.fullNameEng = fullNameEng; - } - - public String getTradingCode() { - return tradingCode; - } - - public void setTradingCode(String tradingCode) { - this.tradingCode = tradingCode; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String clearingCode) { - this.clearingCode = clearingCode; - } - - public String getRegistrationCode() { - return registrationCode; - } - - public void setRegistrationCode(String registrationCode) { - this.registrationCode = registrationCode; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } + public String getCorporationSoleType() { + return corporationSoleType; } + + public void setCorporationSoleType(String corporationSoleType) { + this.corporationSoleType = corporationSoleType; + } + + public String getCountryCode() { + return countryCode; + } + + public void setCountryCode(String countryCode) { + this.countryCode = countryCode; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getProfessionalSign() { + return professionalSign; + } + + public void setProfessionalSign(String professionalSign) { + this.professionalSign = professionalSign; + } + + public String getLegalKind() { + return legalKind; + } + + public void setLegalKind(String legalKind) { + this.legalKind = legalKind; + } + + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } + + public String getResidence() { + return residence; + } + + public void setResidence(String residence) { + this.residence = residence; + } + + public String getShortNameEng() { + return shortNameEng; + } + + public void setShortNameEng(String shortNameEng) { + this.shortNameEng = shortNameEng; + } + + public String getFullNameEng() { + return fullNameEng; + } + + public void setFullNameEng(String fullNameEng) { + this.fullNameEng = fullNameEng; + } + + // static class CompanyInfoFields { +// @JsonProperty +// private Long id; +// @JsonProperty +// private Long companyId; // Company.CompanyInfo.companyId = CompanyInfo.id +// @JsonProperty +// private String clearingMemberCategory; // ref CHAR(4), +// @JsonProperty +// private String corporationSoleType; // ref CHAR(4), +// @JsonProperty +// private String countryCode; //ref CHAR(4), +// @JsonProperty +// private String description; +// @JsonProperty +// private String professionalSign; // ref CHAR(4), +// @JsonProperty +// private String legalKind; // ref CHAR(4), +// @JsonProperty +// private String organizationType; // ref CHAR(4), +// @JsonProperty +// private String residence; // ref CHAR(4), +// @JsonProperty +// private String shortName; +// @JsonProperty +// private String fullName; +// @JsonProperty +// private String shortNameEng; +// @JsonProperty +// private String fullNameEng; +// @JsonProperty +// private String tradingCode; +// @JsonProperty +// private String clearingCode; +// @JsonProperty +// private String registrationCode; +// +// public Long getCompanyId() { +// return companyId; +// } +// +// public void setCompanyId(Long companyId) { +// this.companyId = companyId; +// } +// +// public String getClearingMemberCategory() { +// return clearingMemberCategory; +// } +// +// public void setClearingMemberCategory(String clearingMemberCategory) { +// this.clearingMemberCategory = clearingMemberCategory; +// } +// +// public String getCorporationSoleType() { +// return corporationSoleType; +// } +// +// public void setCorporationSoleType(String corporationSoleType) { +// this.corporationSoleType = corporationSoleType; +// } +// +// public String getCountryCode() { +// return countryCode; +// } +// +// public void setCountryCode(String countryCode) { +// this.countryCode = countryCode; +// } +// +// public String getDescription() { +// return description; +// } +// +// public void setDescription(String description) { +// this.description = description; +// } +// +// public String getProfessionalSign() { +// return professionalSign; +// } +// +// public void setProfessionalSign(String professionalSign) { +// this.professionalSign = professionalSign; +// } +// +// public String getLegalKind() { +// return legalKind; +// } +// +// public void setLegalKind(String legalKind) { +// this.legalKind = legalKind; +// } +// +// public String getOrganizationType() { +// return organizationType; +// } +// +// public void setOrganizationType(String organizationType) { +// this.organizationType = organizationType; +// } +// +// public String getResidence() { +// return residence; +// } +// +// public void setResidence(String residence) { +// this.residence = residence; +// } +// +// public String getShortName() { +// return shortName; +// } +// +// public void setShortName(String shortName) { +// this.shortName = shortName; +// } +// +// public String getFullName() { +// return fullName; +// } +// +// public void setFullName(String fullName) { +// this.fullName = fullName; +// } +// +// public String getShortNameEng() { +// return shortNameEng; +// } +// +// public void setShortNameEng(String shortNameEng) { +// this.shortNameEng = shortNameEng; +// } +// +// public String getFullNameEng() { +// return fullNameEng; +// } +// +// public void setFullNameEng(String fullNameEng) { +// this.fullNameEng = fullNameEng; +// } +// +// public String getTradingCode() { +// return tradingCode; +// } +// +// public void setTradingCode(String tradingCode) { +// this.tradingCode = tradingCode; +// } +// +// public String getClearingCode() { +// return clearingCode; +// } +// +// public void setClearingCode(String clearingCode) { +// this.clearingCode = clearingCode; +// } +// +// public String getRegistrationCode() { +// return registrationCode; +// } +// +// public void setRegistrationCode(String registrationCode) { +// this.registrationCode = registrationCode; +// } +// +// public Long getId() { +// return id; +// } +// +// public void setId(Long id) { +// this.id = id; +// } +// } }