From f11020bd7292f4f2977fac0100a97f30665bd05d Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 28 Feb 2025 18:03:18 +0530 Subject: [PATCH] Fixed issue related to amendment documents in evaluation --- .../dao/ApplicationEvaluationDao.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java index 6f326e2c..a1d247eb 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java @@ -204,23 +204,27 @@ public class ApplicationEvaluationDao { amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument(); String formField=applicationAmendmentRequestEntity.getFormFields(); - AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class); - if (amendmentDetails != null) { - if (amendmentDetails.getAmendmentDocuments() != null) { - List documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(",")) - .map(String::trim) - .filter(id -> !id.isEmpty()) - .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); + if (StringUtils.isNotBlank(amendmentDocument)) { + AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class); - amendmentDocumentResponseBean.setFileDetail(documentResponseBeans); + if (amendmentDetails != null) { + if (StringUtils.isNotBlank(amendmentDetails.getAmendmentDocuments())) { + List documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(",")) + .map(String::trim) + .filter(id -> !id.isEmpty()) + .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId)) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + amendmentDocumentResponseBean.setFileDetail(documentResponseBeans); + } + + amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId()); + amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes()); + amendmentDocumentResponseBean.setValid(amendmentDetails.getValid()); + amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); } - amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId()); - amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes()); - amendmentDocumentResponseBean.setValid(amendmentDetails.getValid()); - amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); } + List amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class); if (amendmentFormFields != null) { for (AmendmentFormField amendmentFormField : amendmentFormFields) {