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

Added three more status for application on NDG, Appointment creation and Admissible.

Browse Source
This commit is contained in:
piyushkag
2024-12-05 20:05:17 +05:30
parent ccb5dbc3e8
commit 9151d15969
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -829,6 +829,9 @@ public class ApplicationDao {
if (status.equals(ApplicationStatusTypeEnum.DRAFT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.AWAITING.getValue()))) { if (status.equals(ApplicationStatusTypeEnum.DRAFT) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.AWAITING.getValue()))) {
applicationEntity.setStatus(status.getValue()); applicationEntity.setStatus(status.getValue());
} }
if(status.equals(ApplicationStatusTypeEnum.ADMISSIBLE) && Boolean.TRUE.equals(applicationEntity.getStatus().equals(ApplicationStatusTypeEnum.APPOINTMENT.getValue()))){
applicationEntity.setStatus(status.getValue());
}
applicationEntity = applicationRepository.save(applicationEntity); applicationEntity = applicationRepository.save(applicationEntity);
if (!status.equals(ApplicationStatusTypeEnum.SUBMIT)) { if (!status.equals(ApplicationStatusTypeEnum.SUBMIT)) {

5
src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java
View File

@@ -14,6 +14,7 @@ import net.gepafin.tendermanagement.entities.ApplicationEntity;
import net.gepafin.tendermanagement.entities.CompanyEntity; import net.gepafin.tendermanagement.entities.CompanyEntity;
import net.gepafin.tendermanagement.entities.DocumentEntity; import net.gepafin.tendermanagement.entities.DocumentEntity;
import net.gepafin.tendermanagement.entities.HubEntity; import net.gepafin.tendermanagement.entities.HubEntity;
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum; import net.gepafin.tendermanagement.enums.DocumentSourceTypeEnum;
import net.gepafin.tendermanagement.enums.VersionActionTypeEnum; import net.gepafin.tendermanagement.enums.VersionActionTypeEnum;
import net.gepafin.tendermanagement.model.request.AppointmentCreationRequest; import net.gepafin.tendermanagement.model.request.AppointmentCreationRequest;
@@ -192,6 +193,7 @@ public class AppointmentDao {
ndgResponseToReturn.setNdg(application.getNdg()); ndgResponseToReturn.setNdg(application.getNdg());
} else if (visuraResponse.getIdVisura() != null) { } else if (visuraResponse.getIdVisura() != null) {
application.setNdgStatus(GepafinConstant.NDG_IN_PROGRESS); application.setNdgStatus(GepafinConstant.NDG_IN_PROGRESS);
application.setStatus(ApplicationStatusTypeEnum.NDG.getValue());
applicationRepository.save(application); applicationRepository.save(application);
/** This code is responsible for adding a version history log for the "Updating ndg status in application" operation. **/ /** This code is responsible for adding a version history log for the "Updating ndg status in application" operation. **/
@@ -245,6 +247,7 @@ public class AppointmentDao {
if (isNdgValid(ndg)) { if (isNdgValid(ndg)) {
company.setNdg(ndg); company.setNdg(ndg);
application.setNdgStatus(GepafinConstant.NDG_GENERATED); application.setNdgStatus(GepafinConstant.NDG_GENERATED);
application.setStatus(ApplicationStatusTypeEnum.NDG.getValue());
application.setNdg(ndg); application.setNdg(ndg);
applicationRepository.save(application); applicationRepository.save(application);
companyRepository.save(company); companyRepository.save(company);
@@ -314,6 +317,7 @@ public class AppointmentDao {
application.setNdg(ndg); application.setNdg(ndg);
application.setIdVisura(idVisura); application.setIdVisura(idVisura);
application.setNdgStatus(GepafinConstant.NDG_GENERATED); application.setNdgStatus(GepafinConstant.NDG_GENERATED);
application.setStatus(ApplicationStatusTypeEnum.NDG.getValue());
company.setNdg(ndg); company.setNdg(ndg);
companyRepository.save(company); companyRepository.save(company);
applicationRepository.save(application); applicationRepository.save(application);
@@ -631,6 +635,7 @@ public class AppointmentDao {
if (appointmentId != null) { if (appointmentId != null) {
// Update application with the appointment ID // Update application with the appointment ID
application.setAppointmentId(appointmentId); application.setAppointmentId(appointmentId);
application.setStatus(ApplicationStatusTypeEnum.APPOINTMENT.getValue());
applicationRepository.save(application); applicationRepository.save(application);
// Log version history // Log version history

5
src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
View File

@@ -12,7 +12,10 @@ public enum ApplicationStatusTypeEnum {
SOCCORSO("SOCCORSO"), SOCCORSO("SOCCORSO"),
APPROVED("APPROVED"), APPROVED("APPROVED"),
REJECTED("REJECTED"), REJECTED("REJECTED"),
EVALUATION("EVALUATION"); EVALUATION("EVALUATION"),
APPOINTMENT("APPOINTMENT"),
NDG("NDG"),
ADMISSIBLE("ADMISSIBLE");
private String value; private String value;