diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java index 0460cb621..ab0ac10ea 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/CompanyService.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.CompanySymbols; +import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -136,6 +137,7 @@ public class CompanyService extends QueueConsumer implements InitializingBean { } company.setWorkflowStatus(req.getWorkflowStatus()); + fillNewCompanyInfo(company, req); Imdg companyMap = transaction.getImdg(IMDGDistributedNames.Map_Company, Company.class); companyMap.insert(company); @@ -152,6 +154,25 @@ public class CompanyService extends QueueConsumer implements InitializingBean { return null; } + void fillNewCompanyInfo(Company company, CompanyNewRequest req) { + if (company.getProfile() == null) + company.setProfile(new CompanyInfo()); + CompanyInfo ci = company.getProfile(); + ci.setId(company.getId()); + ci.setCompanyId(company.getId()); + //todo раскоментировать, когда в реквест добавят новые поля: + // req.getWorkflowStatus() + //ci.setCorporationSoleType(req.getCorporationSoleType()); +// ci.setCountryCode(req.getCountryCode()); +// ci.setDescription(req.getDescription()); +// ci.setProfessionalSign(req.getProfessionalSign()); +// ci.setLegalKind(req.getLegalKind()); +// ci.setOrganizationType(req.getOrganizationType()); +// ci.setResidence(req.getResidence()); +// ci.setShortNameEng(req.getShortNameEng()); +// ci.setFullNameEng(req.getFullNameEng()); + } + private synchronized RequestInfoUpdate updateCompany(BaseRequest companyUpdateRequestBaseRequest) throws ValidationException { CompanyNewRequest updateRequest = companyUpdateRequestBaseRequest.getRequestPayload();