Done ticket GEPAFINBE-187 and GEPAFINBE-188

This commit is contained in:
nisha
2025-03-20 12:56:54 +05:30
parent 8116bceffe
commit b9f40d77ca
5 changed files with 36 additions and 4 deletions

View File

@@ -186,8 +186,12 @@ public class ApplicationEvaluationDao {
List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository
.findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.CHECKLIST.getValue());
List<ApplicationFormEntity> applicationFormEntities = applicationFormRepository.findByApplicationId(entity.getApplicationId());
CompanyEntity company=companyService.validateCompany(entity.getAssignedApplicationsEntity().getApplication().getCompanyId());
setAmendmentDetails(entity,response);
response.setCompanyVatNumber(company.getVatNumber());
response.setCompanyCodiceAteo(company.getCodiceAteco());
setCriteriaResponses(entity, response, evaluationCriterias);
setChecklistResponses(entity, response, checklistEntities);
setFieldResponses(entity, response, applicationFormEntities);
@@ -1155,6 +1159,7 @@ public class ApplicationEvaluationDao {
call = callRepository.findCallEntityByApplicationId(applicationId);
assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);
}
CompanyEntity company=companyService.validateCompany(application.getCompanyId());
List<EvaluationCriteriaEntity> evaluationCriterias = evaluationCriteriaRepository
.findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.EVALUATION_CRITERIA.getValue());
List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository
@@ -1173,6 +1178,8 @@ public class ApplicationEvaluationDao {
response.setCallEndDate(callEndDate);
response.setNumberOfCheck(call.getNumberOfCheck());
response.setAppointmentTemplateId(call.getAppointmentTemplateId());
response.setCompanyVatNumber(company.getVatNumber());
response.setCompanyCodiceAteo(company.getCodiceAteco());
setCriteriaResponses(entity, application.getId(), response, evaluationCriterias);
setChecklistResponses(entity, application.getId(), response, checklistEntities);
setFileResponses(entity, application.getId(), response, applicationFormEntities);