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

Merge pull request #115 from Kitzanos/application-evaluation-issue-prod

Browse Source 
Cherrry pick (Application Evaluation issue)
This commit is contained in:
rbonazzo-KZ
2024-12-03 12:13:49 +01:00
committed by GitHub
parent e1577d0516 676a3298da
commit e64a98ad4c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,8 @@ public class ApplicationEvaluationDao {
Optional<ApplicationFormFieldEntity> formFieldEntityOptional = applicationFormFieldRepository Optional<ApplicationFormFieldEntity> formFieldEntityOptional = applicationFormFieldRepository
.findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(formFieldId, applicationFormId, applicationId); .findByFieldIdAndApplicationFormIdAndApplicationFormApplicationId(formFieldId, applicationFormId, applicationId);
if (formFieldEntityOptional.isPresent()) { if (formFieldEntityOptional.isPresent() && formFieldEntityOptional.get().getFieldValue()!=null && Boolean.FALSE.equals(formFieldEntityOptional.get()
.getFieldValue().isEmpty())) {
String[] documentIds = formFieldEntityOptional.get().getFieldValue().split(","); String[] documentIds = formFieldEntityOptional.get().getFieldValue().split(",");
List<DocumentResponseBean> documentResponseBeans = new ArrayList<>(); List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
@@ -795,6 +796,10 @@ public class ApplicationEvaluationDao {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
findFormFieldValue(applicationId, formFieldId).ifPresent(formField -> { findFormFieldValue(applicationId, formFieldId).ifPresent(formField -> {
Object value = formField.getFieldValue(); Object value = formField.getFieldValue();
if (value == null) {
mappedField.setFieldValue(null);
return;
}
List<String> labels = new ArrayList<>(); List<String> labels = new ArrayList<>();
if (value instanceof String) { if (value instanceof String) {
String fieldValue = (String) value; String fieldValue = (String) value;
@@ -1132,7 +1137,7 @@ public class ApplicationEvaluationDao {
List<DocumentResponseBean> documentResponseBeans = new ArrayList<>(); List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> { findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> {
String fieldValue = formField.getFieldValue(); String fieldValue = formField.getFieldValue();
if (fieldValue != null) { if (fieldValue != null && (Boolean.FALSE.equals(fieldValue.isEmpty()))) {
String[] fieldValues = fieldValue.split(","); String[] fieldValues = fieldValue.split(",");
for (String value : fieldValues) { for (String value : fieldValues) {
Long documentId = Long.valueOf(value.trim()); Long documentId = Long.valueOf(value.trim());
@@ -1164,7 +1169,10 @@ public class ApplicationEvaluationDao {
findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> { findFormFieldValue(applicationId, criteriaFormField.getFormFieldId()).ifPresent(formField -> {
Object value = formField.getFieldValue(); Object value = formField.getFieldValue();
List<String> labels = new ArrayList<>(); List<String> labels = new ArrayList<>();
if (value == null) {
mappedField.setFieldValue(null);
return;
}
if (value instanceof String) { if (value instanceof String) {
List<?> parsedValue = parseJsonValue((String) value, objectMapper); List<?> parsedValue = parseJsonValue((String) value, objectMapper);
addLabelsFromParsedValues(parsedValue, contentResponseBean, labels); addLabelsFromParsedValues(parsedValue, contentResponseBean, labels);
@@ -1249,7 +1257,7 @@ public class ApplicationEvaluationDao {
if (optionalFormField.isPresent()) { if (optionalFormField.isPresent()) {
ApplicationFormFieldEntity formField = optionalFormField.get(); ApplicationFormFieldEntity formField = optionalFormField.get();
if (formField.getFieldValue() != null) { if (formField.getFieldValue() != null &&(Boolean.FALSE.equals(formField.getFieldValue().isEmpty()))) {
FieldResponse fieldResponse = new FieldResponse(); FieldResponse fieldResponse = new FieldResponse();
fieldResponse.setId(fieldId); fieldResponse.setId(fieldId);
String label = null; String label = null;