From 2f173eab4039d9375f283d9710f820d0a47a0617 Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 6 Oct 2025 18:47:33 +0530 Subject: [PATCH 1/3] Resolved conflict --- .../gepafin/tendermanagement/dao/ApplicationEvaluationDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index e67389c3..9c631fbf 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -2571,7 +2571,7 @@ public class ApplicationEvaluationDao { String criteriaJson = evaluationEntity.getCriteria(); if (criteriaJson != null){ BigDecimal totalScore = calculateTotalScore(evaluationEntity.getCriteria()); - if (totalScore.compareTo(new BigDecimal("40")) > 0) { + if (totalScore.compareTo(new BigDecimal(applicationEntity.getCall().getThreshold())) >= 0) { applicationEntity.setStatus(status.getValue()); log.info("Status updated to AWAITING_TECHNICAL_EVALUATION for applicationId: {}", applicationId); } From 45c893b8508afab91348d13d2b07ac3c37260e72 Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 6 Oct 2025 19:17:28 +0530 Subject: [PATCH 2/3] Updated code --- .../gepafin/tendermanagement/dao/ApplicationEvaluationDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 9c631fbf..57158cad 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -2569,7 +2569,7 @@ public class ApplicationEvaluationDao { public void processTechnicalEvaluation(Long applicationId, ApplicationEntity applicationEntity, ApplicationStatusForEvaluation status, ApplicationEvaluationEntity evaluationEntity){ log.info("Starting process for checking scores for applicationId: {}", applicationId); String criteriaJson = evaluationEntity.getCriteria(); - if (criteriaJson != null){ + if (criteriaJson != null && applicationEntity.getCall().getThreshold()!=null ){ BigDecimal totalScore = calculateTotalScore(evaluationEntity.getCriteria()); if (totalScore.compareTo(new BigDecimal(applicationEntity.getCall().getThreshold())) >= 0) { applicationEntity.setStatus(status.getValue()); From 1e611eb546c80d64236422013c8b43c78d775282 Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 6 Oct 2025 18:47:33 +0530 Subject: [PATCH 3/3] Updated code for score checking --- .../gepafin/tendermanagement/dao/ApplicationEvaluationDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index b265edc0..57158cad 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -2571,7 +2571,7 @@ public class ApplicationEvaluationDao { String criteriaJson = evaluationEntity.getCriteria(); if (criteriaJson != null && applicationEntity.getCall().getThreshold()!=null ){ BigDecimal totalScore = calculateTotalScore(evaluationEntity.getCriteria()); - if (totalScore.compareTo(new BigDecimal("40")) >= 0) { + if (totalScore.compareTo(new BigDecimal(applicationEntity.getCall().getThreshold())) >= 0) { applicationEntity.setStatus(status.getValue()); log.info("Status updated to AWAITING_TECHNICAL_EVALUATION for applicationId: {}", applicationId); }