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

Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop

Browse Source
This commit is contained in:
rajesh
2024-09-17 16:16:19 +05:30
parent d2fed5e168 021b7c3269
commit b0881d0d45
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
View File

@@ -267,9 +267,16 @@ public class FlowFormDao {
if (flowEdgesList.size() == 1) { if (flowEdgesList.size() == 1) {
totalFormSteps = 2l; totalFormSteps = 2l;
} }
Long currentStep = 2l;
if (formEntity.getId().equals(formEntity.getCall().getInitialForm())) {
currentStep = 1l;
} else if (formEntity.getId().equals(formEntity.getCall().getFinalForm())) {
currentStep = 3l;
}
List<ApplicationFormEntity> applicationFormList = applicationFormRepository.findByApplicationId(applicationEntity.getId()); List<ApplicationFormEntity> applicationFormList = applicationFormRepository.findByApplicationId(applicationEntity.getId());
nextOrPreviousFormResponse.setTotalFormSteps(totalFormSteps); nextOrPreviousFormResponse.setTotalFormSteps(totalFormSteps);
nextOrPreviousFormResponse.setCompletedSteps(Long.valueOf(applicationFormList.size())); nextOrPreviousFormResponse.setCompletedSteps(Long.valueOf(applicationFormList.size()));
nextOrPreviousFormResponse.setCurrentStep(currentStep);
return nextOrPreviousFormResponse; return nextOrPreviousFormResponse;
} }

2
src/main/java/net/gepafin/tendermanagement/model/response/NextOrPreviousFormResponse.java
View File

@@ -15,6 +15,8 @@ public class NextOrPreviousFormResponse {
private Long completedSteps; private Long completedSteps;
private Long currentStep;
private FormApplicationResponse applicationFormResponse; private FormApplicationResponse applicationFormResponse;
} }