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

Updated code

Browse Source
This commit is contained in:
nisha
2025-03-11 16:44:13 +05:30
parent e261d28dcb
commit 9a0ebc6843
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,18 +800,6 @@ public class CallDao {
List<CallEntity> calls = callRepository.findAll(spec); List<CallEntity> calls = callRepository.findAll(spec);
if (Boolean.TRUE.equals(onlyPreferredCall)) {
validator.validateUserWithCompany(request, companyId);
UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(user.getId(),companyId);
List<BeneficiaryPreferredCallEntity> preferredCalls = beneficiaryPreferredCallRepository
.findByUserIdAndUserWithCompanyIdAndIsDeletedFalse(user.getId(), userWithCompanyEntity.getId());
List<Long> preferredCallIds = preferredCalls.stream()
.map(BeneficiaryPreferredCallEntity::getCallId)
.collect(Collectors.toList());
calls = callRepository.findByIdInAndStatusIn(preferredCallIds, callStatusList);
} else {
calls = callRepository.findByStatusInAndHubId(callStatusList, user.getHub().getId());
}
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
for (CallEntity call : calls) { for (CallEntity call : calls) {
CallEntity oldCallEntity = Utils.getClonedEntityForData(call); CallEntity oldCallEntity = Utils.getClonedEntityForData(call);
@@ -1156,8 +1144,9 @@ public class CallDao {
if (isConfidi.equals(Boolean.TRUE)) { if (isConfidi.equals(Boolean.TRUE)) {
predicates.add(criteriaBuilder.isTrue(root.get("confidi"))); predicates.add(criteriaBuilder.isTrue(root.get("confidi")));
} }
} } else if (Boolean.TRUE.equals(validator.checkIsBeneficiary())) {
else if( Boolean.FALSE.equals(validator.checkIsConfidi()) && isConfidi!=null){ predicates.add(criteriaBuilder.isFalse(root.get("confidi")));
} else if( Boolean.FALSE.equals(validator.checkIsConfidi()) && isConfidi!=null){
if (isConfidi.equals(Boolean.TRUE)) { if (isConfidi.equals(Boolean.TRUE)) {
predicates.add(criteriaBuilder.isTrue(root.get("confidi"))); predicates.add(criteriaBuilder.isTrue(root.get("confidi")));
} }
@@ -1376,12 +1365,14 @@ public class CallDao {
if (validator.checkIsConfidi()) { if (validator.checkIsConfidi()) {
if (onlyConfidiCall==null || Boolean.FALSE.equals(onlyConfidiCall)) { if (onlyConfidiCall==null || Boolean.FALSE.equals(onlyConfidiCall)) {
return criteriaBuilder.conjunction(); return criteriaBuilder.disjunction(); // Returns an empty predicate (no results)
} }
if (onlyConfidiCall!=null && Boolean.TRUE.equals(onlyConfidiCall)) { if (onlyConfidiCall!=null && Boolean.TRUE.equals(onlyConfidiCall)) {
predicates.add(criteriaBuilder.isTrue(root.get("confidi"))); predicates.add(criteriaBuilder.isTrue(root.get("confidi")));
} }
} else if (Boolean.TRUE.equals(validator.checkIsBeneficiary())) {
predicates.add(criteriaBuilder.isFalse(root.get("confidi")));
} else { } else {
if(onlyConfidiCall!=null) { if(onlyConfidiCall!=null) {
if (Boolean.TRUE.equals(onlyConfidiCall)) { if (Boolean.TRUE.equals(onlyConfidiCall)) {