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

Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop

Browse Source
This commit is contained in:
harish
2024-10-24 21:57:31 +05:30
parent 4c29a17c82 1fca821e13
commit 5f8f464799
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
View File

@@ -96,15 +96,20 @@ public class AssignedApplicationsDao {
assignedApplicationsResponse.setApplicationId(assignedApplications.getApplication().getId()); assignedApplicationsResponse.setApplicationId(assignedApplications.getApplication().getId());
ApplicationEntity application = applicationService.validateApplication(assignedApplications.getApplication().getId()); ApplicationEntity application = applicationService.validateApplication(assignedApplications.getApplication().getId());
String callName = application.getCall().getName(); String callName = application.getCall() != null ? application.getCall().getName() : "";
Long protocolNumber = application.getProtocol().getProtocolNumber(); Long protocolNumber = (application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null)
? application.getProtocol().getProtocolNumber()
: 0;
LocalDateTime submissionDate = application.getSubmissionDate(); LocalDateTime submissionDate = application.getSubmissionDate();
UserEntity userEntity = userService.validateUser(assignedApplications.getUserId()); UserEntity userEntity = userService.validateUser(application.getUserId());
String firstName = userEntity.getBeneficiary().getFirstName();
String lastName = userEntity.getBeneficiary().getLastName(); String firstName = userEntity.getBeneficiary() != null ? userEntity.getBeneficiary().getFirstName() : null;
String beneficiaryName = String lastName = userEntity.getBeneficiary() != null ? userEntity.getBeneficiary().getLastName() : null;
(firstName != null ? firstName : "") +
(lastName != null ? " " + lastName : ""); String beneficiaryName = (firstName != null && !firstName.isBlank() ? firstName : "") +
(lastName != null && !lastName.isBlank() ? " " + lastName : "");
beneficiaryName = beneficiaryName.isBlank() ? "" : beneficiaryName;
assignedApplicationsResponse.setAssignedBy(assignedApplications.getAssignedBy()); assignedApplicationsResponse.setAssignedBy(assignedApplications.getAssignedBy());
assignedApplicationsResponse.setUserId(assignedApplications.getUserId()); assignedApplicationsResponse.setUserId(assignedApplications.getUserId());