Done ticket GEPAFINBE-187 and GEPAFINBE-188

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -490,7 +490,8 @@ public class GepafinConstant {
     public static final String PREFERRED_CALL_ID="preferredCallId";
     public static final String REGION_ID="regionId";
     public static final String DELEGATION_TEMPLATE_CONFIDI="DELEGATION_TEMPLATE_CONFIDI";
-
+    public static final String PDF_TRUE="PDF_TRUE";
+    public static final String PDF_FALSE="PDF_FALSE";
 }
 
 

src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java

@@ -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);

src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java

@@ -14,6 +14,7 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.*;
 import net.gepafin.tendermanagement.model.request.FieldLabelValuePairRequest;
 import net.gepafin.tendermanagement.model.response.*;
+import net.gepafin.tendermanagement.repositories.DocumentRepository;
 import net.gepafin.tendermanagement.repositories.HubRepository;
 import net.gepafin.tendermanagement.service.CallService;
 import net.gepafin.tendermanagement.util.PdfUtils;
@@ -54,6 +55,9 @@ public class PdfDao {
     @Autowired
     private HubRepository hubRepository;
 
+    @Autowired
+    private DocumentRepository documentRepository;
+
     public static final Logger log = LoggerFactory.getLogger(PdfDao.class);
 
     public byte[] generatePdf(HttpServletRequest request,Long applicationId) {
@@ -219,8 +223,10 @@ public class PdfDao {
                 if (fieldValue.trim().equalsIgnoreCase("true")) {
                     // Use images for tick and cross
                     try {
+                        DocumentEntity documentEntity = documentRepository.findBySource(GepafinConstant.PDF_TRUE).get(0);
+
 //                        img = Image.getInstance("true.jpg");  update code after cherry-pick 
-                        img = Image.getInstance("https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/true.png");
+                        img = Image.getInstance(documentEntity.getFilePath());
                     } catch (IOException e) {
                       log.error("Error while uploading image for pdf for true");
                     }
@@ -238,7 +244,9 @@ public class PdfDao {
                 } else if (fieldValue.trim().equalsIgnoreCase("false")) {
                     // Use images for tick and cross
                     try {
-                        img = Image.getInstance("https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/false.png");
+                        DocumentEntity documentEntity = documentRepository.findBySource(GepafinConstant.PDF_FALSE).get(0);
+
+                        img = Image.getInstance(documentEntity.getFilePath());
                     } catch (IOException e) {
                         log.error("Error while uploading image for pdf for false");
                     }

src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java

@@ -47,5 +47,7 @@ public class ApplicationEvaluationResponse {
     private Long numberOfCheck;
     private Long appointmentTemplateId;
     private EvaluationVersionEnum evaluationVersion;
-    
+    private String companyVatNumber;
+    private String companyCodiceAteo;
+
 }

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2640,5 +2640,19 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/update_form_field_data_12-03-2025.sql"/>
     </changeSet>
+    <changeSet id="18-03-2025_NK_181010" author="Nisha Kashyap">
+        <insert tableName="document">
+            <column name="file_name" value="GEPAFIN_PDF_TRUE.PNG"></column>
+            <column name="file_path" value="https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/local/template/true.png"></column>
+            <column name="type" value="IMAGE"></column>
+            <column name="source" value="PDF_TRUE"></column>
+        </insert>
+        <insert tableName="document">
+            <column name="file_name" value="GEPAFIN_PDF_FALSE.PNG"></column>
+            <column name="file_path" value="https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/local/template/false.png"></column>
+            <column name="type" value="IMAGE"></column>
+            <column name="source" value="PDF_FALSE"></column>
+        </insert>
+    </changeSet>
 
 </databaseChangeLog>