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

Resolved conflict

Browse Source
This commit is contained in:
rajesh
2026-04-13 17:05:10 +05:30
parent 3c8f2b0c84
commit 5aa342bd05
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1166,9 +1166,10 @@ public class ApplicationAmendmentRequestDao {
if(Boolean.FALSE.equals(existingApplicationAmendment.getType().equals(ApplicationAmendmentRequestTypeEnum.SPECIAL.getValue()))){ if(Boolean.FALSE.equals(existingApplicationAmendment.getType().equals(ApplicationAmendmentRequestTypeEnum.SPECIAL.getValue()))){
application.setStatus(application.getPreviousStatus()); application.setStatus(application.getPreviousStatus());
}
applicationRepository.save(application); applicationRepository.save(application);
log.info("Updated Application status to previous state for Application ID: {}", application.getId()); loggingUtil.addVersionHistory(
VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEntityData).newData(application).build());
}
existingApplicationAmendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().setStatus(AssignedApplicationEnum.OPEN.getValue()); existingApplicationAmendment.getApplicationEvaluationEntity().getAssignedApplicationsEntity().setStatus(AssignedApplicationEnum.OPEN.getValue());
@@ -1189,9 +1190,6 @@ public class ApplicationAmendmentRequestDao {
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity) loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluationEntity)
.newData(existingApplicationEvaluationEntity).build()); .newData(existingApplicationEvaluationEntity).build());
/** This code is responsible for adding a version history log for the "Update Application status" operation. **/
loggingUtil.addVersionHistory(
VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEntityData).newData(application).build());
/** This code is responsible for adding a version history log for the "Update assigned application " operation. **/ /** This code is responsible for adding a version history log for the "Update assigned application " operation. **/
loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationData) loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldAssignedApplicationData)

19
src/main/java/net/gepafin/tendermanagement/scheduler/ApplicationAmendmentScheduler.java
View File

@@ -24,8 +24,8 @@ import org.springframework.stereotype.Component;
import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity; import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity; import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum; import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestTypeEnum;
import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum; import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum; import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
import net.gepafin.tendermanagement.enums.NotificationTypeEnum; import net.gepafin.tendermanagement.enums.NotificationTypeEnum;
import net.gepafin.tendermanagement.enums.UserActionContextEnum; import net.gepafin.tendermanagement.enums.UserActionContextEnum;
@@ -129,9 +129,22 @@ public class ApplicationAmendmentScheduler {
// Update AssignedApplicationsEntity status // Update AssignedApplicationsEntity status
updateAssignedApplicationStatus(evaluation.getAssignedApplicationsEntity()); updateAssignedApplicationStatus(evaluation.getAssignedApplicationsEntity());
// Update ApplicationEntity status // Skip application status restore only when every amendment expired *in this run* for this
// evaluation is SPECIAL. (Do not use all amendments on the eval — a closed non-SPECIAL
// record from the past would wrongly force a previousStatus restore after special expiry.)
List<ApplicationAmendmentRequestEntity> expiredThisRunForEval = amendmentRequests.stream()
.filter(req -> req.getApplicationEvaluationEntity().getId().equals(evaluation.getId()))
.toList();
boolean skipApplicationStatusRestore = !expiredThisRunForEval.isEmpty()
&& expiredThisRunForEval.stream()
.allMatch(req -> ApplicationAmendmentRequestTypeEnum.SPECIAL.getValue().equals(req.getType()));
if (!skipApplicationStatusRestore) {
updateApplicationStatus(evaluation.getAssignedApplicationsEntity().getApplication()); updateApplicationStatus(evaluation.getAssignedApplicationsEntity().getApplication());
} else {
log.info(
"Amendment expiration: skipping Application status restore (all amendments expired this run are SPECIAL), evaluationId={}",
evaluation.getId());
}
log.info("Updated EndDate and suspension days for ApplicationEvaluation with ID: {}", log.info("Updated EndDate and suspension days for ApplicationEvaluation with ID: {}",
evaluation.getId()); evaluation.getId());