BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the field name companyCodiceAteco

Browse Source
This commit is contained in:
nisha
2025-03-20 15:58:56 +05:30
parent c50b5059cb
commit e311f5bc7c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
View File

@@ -191,7 +191,7 @@ public class ApplicationEvaluationDao {
setAmendmentDetails(entity,response); setAmendmentDetails(entity,response);
response.setCompanyVatNumber(company.getVatNumber()); response.setCompanyVatNumber(company.getVatNumber());
response.setCompanyCodiceAteo(company.getCodiceAteco()); response.setCompanyCodiceAteco(company.getCodiceAteco());
setCriteriaResponses(entity, response, evaluationCriterias); setCriteriaResponses(entity, response, evaluationCriterias);
setChecklistResponses(entity, response, checklistEntities); setChecklistResponses(entity, response, checklistEntities);
setFieldResponses(entity, response, applicationFormEntities); setFieldResponses(entity, response, applicationFormEntities);
@@ -1179,7 +1179,7 @@ public class ApplicationEvaluationDao {
response.setNumberOfCheck(call.getNumberOfCheck()); response.setNumberOfCheck(call.getNumberOfCheck());
response.setAppointmentTemplateId(call.getAppointmentTemplateId()); response.setAppointmentTemplateId(call.getAppointmentTemplateId());
response.setCompanyVatNumber(company.getVatNumber()); response.setCompanyVatNumber(company.getVatNumber());
response.setCompanyCodiceAteo(company.getCodiceAteco()); response.setCompanyCodiceAteco(company.getCodiceAteco());
setCriteriaResponses(entity, application.getId(), response, evaluationCriterias); setCriteriaResponses(entity, application.getId(), response, evaluationCriterias);
setChecklistResponses(entity, application.getId(), response, checklistEntities); setChecklistResponses(entity, application.getId(), response, checklistEntities);
setFileResponses(entity, application.getId(), response, applicationFormEntities); setFileResponses(entity, application.getId(), response, applicationFormEntities);
@@ -2248,6 +2248,7 @@ public class ApplicationEvaluationDao {
private ApplicationEvaluationFormResponse processEvaluationForm(ApplicationEvaluationEntity evaluationEntity){ private ApplicationEvaluationFormResponse processEvaluationForm(ApplicationEvaluationEntity evaluationEntity){
Object convertedResponse = convertToResponse(evaluationEntity); Object convertedResponse = convertToResponse(evaluationEntity);
CompanyEntity company=companyService.validateCompany(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCompanyId());
ApplicationEvaluationFormResponse response = objectMapper.convertValue(convertedResponse, ApplicationEvaluationFormResponse.class); ApplicationEvaluationFormResponse response = objectMapper.convertValue(convertedResponse, ApplicationEvaluationFormResponse.class);
EvaluationFormEntity evaluationFormEntity = evaluationFormRepository.findByCallIdAndIsDeletedFalse(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCall().getId()); EvaluationFormEntity evaluationFormEntity = evaluationFormRepository.findByCallIdAndIsDeletedFalse(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCall().getId());
@@ -2256,7 +2257,8 @@ public class ApplicationEvaluationDao {
if (evaluationFormEntity != null) { if (evaluationFormEntity != null) {
response.setApplicationEvaluationFormResponse(convertEvaluationFormToResponse(evaluationFormEntity, evaluationEntity)); response.setApplicationEvaluationFormResponse(convertEvaluationFormToResponse(evaluationFormEntity, evaluationEntity));
} }
response.setCompanyVatNumber(company.getVatNumber());
response.setCompanyCodiceAteco(company.getCodiceAteco());
return response; return response;
} }

2
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
View File

@@ -46,5 +46,7 @@ public class ApplicationEvaluationFormResponse {
private EvaluationVersionEnum evaluationVersion; private EvaluationVersionEnum evaluationVersion;
private Long numberOfCheck; private Long numberOfCheck;
private Long appointmentTemplateId; private Long appointmentTemplateId;
private String companyVatNumber;
private String companyCodiceAteco;
} }

2
src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java
View File

@@ -48,6 +48,6 @@ public class ApplicationEvaluationResponse {
private Long appointmentTemplateId; private Long appointmentTemplateId;
private EvaluationVersionEnum evaluationVersion; private EvaluationVersionEnum evaluationVersion;
private String companyVatNumber; private String companyVatNumber;
private String companyCodiceAteo; private String companyCodiceAteco;
} }