From e096f15b0335532cb9e141cd071785047c00b5c9 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 30 Jun 2025 16:46:56 +0530
Subject: [PATCH] Updated logic for application status

---
 .../tendermanagement/dao/ApplicationEvaluationDao.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 9fa68a28..215a5e24 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -1932,17 +1932,17 @@ public class ApplicationEvaluationDao {
                 }
             }
 
-            if(newStatus.equals(ApplicationStatusForEvaluation.TECHNICAL_EVALUATION) && Boolean.TRUE.equals(application.getStatus().equals(ApplicationStatusTypeEnum.ADMISSIBLE.getValue()))){
+            if(newStatus.equals(ApplicationStatusForEvaluation.TECHNICAL_EVALUATION)){
                 log.info("Processing technical evaluation for applicationId: {}", application.getId());
                 processTechnicalEvaluation(application.getId(), application, newStatus);
             }
 
-            if((newStatus.equals(ApplicationStatusForEvaluation.APPROVED) || newStatus.equals(ApplicationStatusForEvaluation.REJECTED)) && application.getStatus().equals(ApplicationStatusTypeEnum.EVALUATION.getValue())) {
+            if((newStatus.equals(ApplicationStatusForEvaluation.APPROVED) || newStatus.equals(ApplicationStatusForEvaluation.REJECTED))) {
                 application.setStatus(newStatus.getValue());
                 log.info("Application status updated to {} for applicationId: {}", newStatus, application.getId());
             }
 
-            if(newStatus.equals(ApplicationStatusForEvaluation.TECHNICAL_EVALUATION_REJECTED) && Boolean.TRUE.equals(application.getStatus().equals(ApplicationStatusTypeEnum.ADMISSIBLE.getValue()))) {
+            if(newStatus.equals(ApplicationStatusForEvaluation.TECHNICAL_EVALUATION_REJECTED)) {
                 application.setStatus(newStatus.getValue());
                 log.info("Application status updated to {} for applicationId: {}", newStatus, application.getId());
                 emailNotificationDao.sendMailForApplicationTechnicalEvaluationRejected(application,hub,existingEntity);