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

Merge pull request #245 from Kitzanos/fixed-issue-form-field-map

Browse Source 
Cherry-pick ( Fixed issue in form field map)
This commit is contained in:
Rinaldo
2025-03-17 13:34:36 +01:00
committed by GitHub
parent eb68a539ed dc2e0548cb
commit f05985642d
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -887,8 +887,10 @@ public class ApplicationEvaluationDao {
amendmentFormField.setValid(amendmentDetailsRequest.getValid()); amendmentFormField.setValid(amendmentDetailsRequest.getValid());
} }
}); });
if(Boolean.FALSE.equals(CollectionUtils.isEmpty(formFieldsMap))) {
applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(formFieldsMap.values().stream().toList())); applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(formFieldsMap.values().stream().toList()));
} }
}
// private void updateAmendmentDocuments(List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities, List<AmendmentDetailsRequest> amendmentFormFields) { // private void updateAmendmentDocuments(List<ApplicationAmendmentRequestEntity> applicationAmendmentRequestEntities, List<AmendmentDetailsRequest> amendmentFormFields) {

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

@@ -214,6 +214,7 @@ public class AssignedApplicationsDao {
assignedApplicationsResponse.setAppointmentTemplateId(application.getCall().getAppointmentTemplateId()); assignedApplicationsResponse.setAppointmentTemplateId(application.getCall().getAppointmentTemplateId());
assignedApplicationsResponse.setNdg(application.getNdg()); assignedApplicationsResponse.setNdg(application.getNdg());
assignedApplicationsResponse.setAppointmentId(application.getAppointmentId()); assignedApplicationsResponse.setAppointmentId(application.getAppointmentId());
assignedApplicationsResponse.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus()));
return assignedApplicationsResponse; return assignedApplicationsResponse;
} }

3
src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
View File

@@ -1,6 +1,8 @@
package net.gepafin.tendermanagement.model.response; package net.gepafin.tendermanagement.model.response;
import com.amazonaws.services.dynamodbv2.xspec.S;
import lombok.Data; import lombok.Data;
import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
import net.gepafin.tendermanagement.enums.AssignedApplicationEnum; import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
import net.gepafin.tendermanagement.enums.EvaluationVersionEnum; import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
import net.gepafin.tendermanagement.model.BaseBean; import net.gepafin.tendermanagement.model.BaseBean;
@@ -28,6 +30,7 @@ public class AssignedApplicationsResponse extends BaseBean {
private EvaluationVersionEnum evaluationVersion; private EvaluationVersionEnum evaluationVersion;
private String ndg; private String ndg;
private String appointmentId; private String appointmentId;
private ApplicationStatusTypeEnum applicationStatus;
} }