diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index ae045358..17cac4c4 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -191,7 +191,7 @@ public class ApplicationEvaluationDao { setAmendmentDetails(entity,response); response.setCompanyVatNumber(company.getVatNumber()); - response.setCompanyCodiceAteo(company.getCodiceAteco()); + response.setCompanyCodiceAteco(company.getCodiceAteco()); setCriteriaResponses(entity, response, evaluationCriterias); setChecklistResponses(entity, response, checklistEntities); setFieldResponses(entity, response, applicationFormEntities); @@ -1179,7 +1179,7 @@ public class ApplicationEvaluationDao { response.setNumberOfCheck(call.getNumberOfCheck()); response.setAppointmentTemplateId(call.getAppointmentTemplateId()); response.setCompanyVatNumber(company.getVatNumber()); - response.setCompanyCodiceAteo(company.getCodiceAteco()); + response.setCompanyCodiceAteco(company.getCodiceAteco()); setCriteriaResponses(entity, application.getId(), response, evaluationCriterias); setChecklistResponses(entity, application.getId(), response, checklistEntities); setFileResponses(entity, application.getId(), response, applicationFormEntities); @@ -2248,6 +2248,7 @@ public class ApplicationEvaluationDao { private ApplicationEvaluationFormResponse processEvaluationForm(ApplicationEvaluationEntity evaluationEntity){ Object convertedResponse = convertToResponse(evaluationEntity); + CompanyEntity company=companyService.validateCompany(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCompanyId()); ApplicationEvaluationFormResponse response = objectMapper.convertValue(convertedResponse, ApplicationEvaluationFormResponse.class); EvaluationFormEntity evaluationFormEntity = evaluationFormRepository.findByCallIdAndIsDeletedFalse(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCall().getId()); @@ -2256,7 +2257,8 @@ public class ApplicationEvaluationDao { if (evaluationFormEntity != null) { response.setApplicationEvaluationFormResponse(convertEvaluationFormToResponse(evaluationFormEntity, evaluationEntity)); } - + response.setCompanyVatNumber(company.getVatNumber()); + response.setCompanyCodiceAteco(company.getCodiceAteco()); return response; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java index 0b12a4a6..38530c8a 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java @@ -46,5 +46,7 @@ public class ApplicationEvaluationFormResponse { private EvaluationVersionEnum evaluationVersion; private Long numberOfCheck; private Long appointmentTemplateId; + private String companyVatNumber; + private String companyCodiceAteco; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java index 6e6d6dad..47b018f9 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -48,6 +48,6 @@ public class ApplicationEvaluationResponse { private Long appointmentTemplateId; private EvaluationVersionEnum evaluationVersion; private String companyVatNumber; - private String companyCodiceAteo; + private String companyCodiceAteco; }