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

updated code

Browse Source
This commit is contained in:
rajesh
2024-11-08 21:12:25 +05:30
parent 4d1a1a9352
commit 3671d1409a
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -672,9 +672,11 @@ public class ApplicationEvaluationDao {
for (CriteriaFormFieldEntity criteriaFormField : criteriaFormFields) { for (CriteriaFormFieldEntity criteriaFormField : criteriaFormFields) {
String formFieldId = criteriaFormField.getFormFieldId(); String formFieldId = criteriaFormField.getFormFieldId();
if (!mappedFieldMap.containsKey(formFieldId)) { if (!mappedFieldMap.containsKey(formFieldId)) {
CriteriaMappedField mappedField = new CriteriaMappedField(); // CriteriaMappedField mappedField = new CriteriaMappedField();
populateMappedField(mappedField, formFieldId, criteriaFormField, applicationForm, applicationId); CriteriaMappedField mappedField = populateMappedField(formFieldId, criteriaFormField, applicationForm, applicationId);
mappedFieldMap.put(formFieldId, mappedField); if(mappedField != null) {
mappedFieldMap.put(formFieldId, mappedField);
}
} }
} }
} }
@@ -682,10 +684,14 @@ public class ApplicationEvaluationDao {
return mappedFieldMap; return mappedFieldMap;
} }
private void populateMappedField(CriteriaMappedField mappedField, String formFieldId, private CriteriaMappedField populateMappedField(String formFieldId,
CriteriaFormFieldEntity criteriaFormField, CriteriaFormFieldEntity criteriaFormField,
ApplicationFormEntity applicationForm, Long applicationId) { ApplicationFormEntity applicationForm, Long applicationId) {
CriteriaMappedField mappedField = new CriteriaMappedField();
mappedField.setId(formFieldId); mappedField.setId(formFieldId);
if(Boolean.FALSE.equals(criteriaFormField.getFormId().equals(applicationForm.getForm().getId()))) {
return null;
}
formRepository.findById(criteriaFormField.getFormId()).ifPresent(formEntity -> { formRepository.findById(criteriaFormField.getFormId()).ifPresent(formEntity -> {
// List<ContentResponseBean> contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class); // List<ContentResponseBean> contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class);
List<ContentResponseBean> contentResponseBeans = formDao.convertFormEntityToFormResponseBean(formEntity).getContent(); List<ContentResponseBean> contentResponseBeans = formDao.convertFormEntityToFormResponseBean(formEntity).getContent();
@@ -710,6 +716,7 @@ public class ApplicationEvaluationDao {
} }
}); });
}); });
return mappedField;
} }