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

Resolved conflicts while sync with master

Browse Source
This commit is contained in:
rajesh
2025-06-20 13:27:33 +05:30
parent 404c700372 04e34f6ca1
commit 98bb4a6874
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1146,6 +1146,7 @@ public class ApplicationAmendmentRequestDao {
public ApplicationAmendmentRequestResponse extendResponseDays(Long id, Long newResponseDays) { public ApplicationAmendmentRequestResponse extendResponseDays(Long id, Long newResponseDays) {
log.info("Extending response days for Application Amendment ID: {}, Additional Days: {}", id, newResponseDays); log.info("Extending response days for Application Amendment ID: {}, Additional Days: {}", id, newResponseDays);
ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = validatApplicationAmendmentRequestByStatus(id,ApplicationAmendmentRequestEnum.EXPIRED.getValue()); ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = validatApplicationAmendmentRequestByStatus(id,ApplicationAmendmentRequestEnum.EXPIRED.getValue());
log.info("Extending response days for Application Amendment ID: {}, Additional Days: {}", id, newResponseDays);
if (newResponseDays != null && newResponseDays > 0) { if (newResponseDays != null && newResponseDays > 0) {
ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(applicationAmendmentRequestEntity); ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(applicationAmendmentRequestEntity);

2
src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
View File

@@ -2592,7 +2592,7 @@ public class ApplicationEvaluationDao {
return totalScore; return totalScore;
} }
catch (Exception e) { catch (Exception e) {
log.error(" Error parsing criteria JSON: {}", e.getMessage()); log.error("Error parsing criteria JSON. Input: {}. Exception: {}", criteriaJson, e.getMessage(), e);
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
} }

5
src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
View File

@@ -9,6 +9,8 @@ import org.hibernate.annotations.Where;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigDecimal;
@Entity @Entity
@Table(name = "EVALUATION_CRITERIA") @Table(name = "EVALUATION_CRITERIA")
@@ -27,4 +29,7 @@ public class EvaluationCriteriaEntity extends BaseEntity {
@Column(name = "SCORE", nullable = false) @Column(name = "SCORE", nullable = false)
private BigDecimal score; private BigDecimal score;
@Column(name ="IS_DELETED", nullable = false)
private Boolean isDeleted = false;
} }