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

Merge pull request #321 from Kitzanos/added-pec-csv-prod

Browse Source 
Cherry-pick (Added field PEC in csv)
This commit is contained in:
Rinaldo
2025-07-03 11:41:47 +02:00
committed by GitHub
parent c29901ace0 ad5be2f109
commit 68a0bbd794
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -219,6 +219,9 @@ public class ApplicationDao {
@Autowired @Autowired
private EvaluationCriteriaRepository evaluationCriteriaRepository; private EvaluationCriteriaRepository evaluationCriteriaRepository;
@Autowired
private CallRepository callRepository;
public final Random random = new Random(); public final Random random = new Random();
public ApplicationResponseBean createApplication(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long formId, Long applicationId) { 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); emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(GepafinConstant.RINALDO_EMAIL),emailLogRequest);
} }
public byte[] downloadRankingCsv(Long callId) { public byte[] downloadRankingCsv(Long callId,UserEntity userEntity) {
CallEntity callEntity = callService.validateCall(callId);
CallEntity callEntity = validator.validateUserWithCall(userEntity,callId);
List<ApplicationEntity> applications = List<ApplicationEntity> applications =
applicationRepository.findByCallIdAndIsDeletedFalseAndStatusIn( applicationRepository.findByCallIdAndIsDeletedFalseAndStatusIn(
@@ -2489,7 +2493,7 @@ public class ApplicationDao {
// Build headers dynamically // Build headers dynamically
List<String> headers = new ArrayList<>(List.of( 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); headers.addAll(dynamicLabels);
@@ -2511,6 +2515,8 @@ public class ApplicationDao {
row.add(formattedAmount); row.add(formattedAmount);
row.add(app.getStatus()); row.add(app.getStatus());
row.add(appInstructorMap.getOrDefault(appId, "")); row.add(appInstructorMap.getOrDefault(appId, ""));
row.add(app.getPecEmail());
row.add(company.getPec());
row.add(appTotalScoreMap.get(appId)); row.add(appTotalScoreMap.get(appId));
Map<String, String> scores = appLabelScoresMap.getOrDefault(appId, Collections.emptyMap()); Map<String, String> scores = appLabelScoresMap.getOrDefault(appId, Collections.emptyMap());

2
src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
View File

@@ -180,6 +180,6 @@ public class ApplicationServiceImpl implements ApplicationService {
@Override @Override
public byte[] downloadRankingCsv(HttpServletRequest request, Long callId) { public byte[] downloadRankingCsv(HttpServletRequest request, Long callId) {
UserEntity userEntity = validator.validateUser(request); UserEntity userEntity = validator.validateUser(request);
return applicationDao.downloadRankingCsv(callId); return applicationDao.downloadRankingCsv(callId,userEntity);
} }
} }