From ad5be2f10906b2f8883a5951cbcca8d37869c9a3 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Thu, 3 Jul 2025 15:01:31 +0530
Subject: [PATCH] Added field pec in csv

---
 .../gepafin/tendermanagement/dao/ApplicationDao.java | 12 +++++++++---
 .../service/impl/ApplicationServiceImpl.java         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 3f829a92..0564ad66 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -219,6 +219,9 @@ public class ApplicationDao {
     @Autowired
     private EvaluationCriteriaRepository evaluationCriteriaRepository;
 
+    @Autowired
+    private CallRepository callRepository;
+
     public final Random random = new Random();
 
     public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long formId, Long applicationId) {
@@ -2420,8 +2423,9 @@ public class ApplicationDao {
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(GepafinConstant.RINALDO_EMAIL),emailLogRequest);
     }
 
-    public byte[] downloadRankingCsv(Long callId) {
-        CallEntity callEntity = callService.validateCall(callId);
+    public byte[] downloadRankingCsv(Long callId,UserEntity userEntity) {
+
+        CallEntity callEntity = validator.validateUserWithCall(userEntity,callId);
 
         List<ApplicationEntity> applications =
                 applicationRepository.findByCallIdAndIsDeletedFalseAndStatusIn(
@@ -2489,7 +2493,7 @@ public class ApplicationDao {
 
         // Build headers dynamically
         List<String> headers = new ArrayList<>(List.of(
-                "ApplicationID","Application VatNumber", "VatNumber", "Company Name", "Protocol", "Requested Amount", "Status","Instructor Name", "Total Score"
+                "ApplicationID","Application VatNumber", "VatNumber", "Company Name", "Protocol", "Requested Amount", "Status","Instructor Name","Application PEC","Company PEC","Total Score"
         ));
         headers.addAll(dynamicLabels);
 
@@ -2511,6 +2515,8 @@ public class ApplicationDao {
             row.add(formattedAmount);
             row.add(app.getStatus());
             row.add(appInstructorMap.getOrDefault(appId, ""));
+            row.add(app.getPecEmail());
+            row.add(company.getPec());
             row.add(appTotalScoreMap.get(appId));
 
             Map<String, String> scores = appLabelScoresMap.getOrDefault(appId, Collections.emptyMap());
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
index aca38d23..e311340e 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
@@ -180,6 +180,6 @@ public class ApplicationServiceImpl implements ApplicationService {
     @Override
     public byte[] downloadRankingCsv(HttpServletRequest request, Long callId) {
         UserEntity userEntity = validator.validateUser(request);
-        return applicationDao.downloadRankingCsv(callId);
+        return applicationDao.downloadRankingCsv(callId,userEntity);
     }
 }