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

Fixed application status issue

Browse Source
This commit is contained in:
rajesh
2025-11-13 12:17:21 +05:30
parent 1963aebc9c
commit 7e73870f29
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
View File

@@ -380,6 +380,15 @@ public class ApplicationAmendmentRequestDao {
//Set stop date time in the entity becuase amendment has started //Set stop date time in the entity becuase amendment has started
applicationEvaluationEntity.setStopDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now())); applicationEvaluationEntity.setStopDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
} }
}
boolean noneClosedOrExpired = amendmentRequest.stream()
.noneMatch(amendment ->
amendment.getStatus().equals(ApplicationAmendmentRequestEnum.CLOSE.getValue()) ||
amendment.getStatus().equals(ApplicationAmendmentRequestEnum.EXPIRED.getValue())
);
if(Boolean.TRUE.equals(noneClosedOrExpired)){
applicationEntity.setPreviousStatus(oldApplicationEntity.getStatus()); applicationEntity.setPreviousStatus(oldApplicationEntity.getStatus());
} }

2
src/main/java/net/gepafin/tendermanagement/repositories/ApplicationAmendmentRequestRepository.java
View File

@@ -73,6 +73,7 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
" SELECT 1 FROM ApplicationAmendmentRequestEntity activeAmendment" + " SELECT 1 FROM ApplicationAmendmentRequestEntity activeAmendment" +
" WHERE activeAmendment.applicationEvaluationEntity.id = a.applicationEvaluationEntity.id " + " WHERE activeAmendment.applicationEvaluationEntity.id = a.applicationEvaluationEntity.id " +
" AND activeAmendment.status NOT IN('CLOSE','EXPIRED') " + " AND activeAmendment.status NOT IN('CLOSE','EXPIRED') " +
" AND activeAmendment.type NOT IN('SPECIAL') " +
" AND activeAmendment.isDeleted = false) ") " AND activeAmendment.isDeleted = false) ")
Set<ApplicationEvaluationEntity> findEvaluationsWithoutActiveAmendmentsByIds(@Param("applicationEvaluationIds") Set<Long> applicationEvaluationIds); Set<ApplicationEvaluationEntity> findEvaluationsWithoutActiveAmendmentsByIds(@Param("applicationEvaluationIds") Set<Long> applicationEvaluationIds);
@@ -154,4 +155,5 @@ public interface ApplicationAmendmentRequestRepository extends JpaRepository<App
ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatus(Long id,String status); ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatus(Long id,String status);
ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatusIn(Long id, List<String> statusList); ApplicationAmendmentRequestEntity findByIdAndIsDeletedFalseAndStatusIn(Long id, List<String> statusList);
} }