Fixed application status issue

2025-11-13 12:17:21 +05:30
parent 1963aebc9c
commit 7e73870f29
2 changed files with 11 additions and 0 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -380,6 +380,15 @@ public class ApplicationAmendmentRequestDao {
                //Set stop date time in the entity becuase amendment has started
                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());
        }