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

Merge pull request #230 from Kitzanos/amendment-document-issue-prod

Browse Source 
Cherry-pick (Fixed issue related to amendment documents in evaluation)
This commit is contained in:
Rinaldo
2025-03-03 06:25:25 +01:00
committed by GitHub
parent 9f7bd75203 f11020bd72
commit 9f30a85e04
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,23 +204,27 @@ public class ApplicationEvaluationDao {
amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId()); amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId());
String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument(); String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument();
String formField=applicationAmendmentRequestEntity.getFormFields(); String formField=applicationAmendmentRequestEntity.getFormFields();
if (StringUtils.isNotBlank(amendmentDocument)) {
AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class); AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class);
if (amendmentDetails != null) { if (amendmentDetails != null) {
if (amendmentDetails.getAmendmentDocuments() != null) { if (StringUtils.isNotBlank(amendmentDetails.getAmendmentDocuments())) {
List<DocumentResponseBean> documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(",")) List<DocumentResponseBean> documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(","))
.map(String::trim) .map(String::trim)
.filter(id -> !id.isEmpty()) .filter(id -> !id.isEmpty())
.map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId)) .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId))
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toList()); .collect(Collectors.toList());
amendmentDocumentResponseBean.setFileDetail(documentResponseBeans); amendmentDocumentResponseBean.setFileDetail(documentResponseBeans);
} }
amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId()); amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId());
amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes()); amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes());
amendmentDocumentResponseBean.setValid(amendmentDetails.getValid()); amendmentDocumentResponseBean.setValid(amendmentDetails.getValid());
amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean); amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean);
} }
}
List<AmendmentFormField> amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class); List<AmendmentFormField> amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class);
if (amendmentFormFields != null) { if (amendmentFormFields != null) {
for (AmendmentFormField amendmentFormField : amendmentFormFields) { for (AmendmentFormField amendmentFormField : amendmentFormFields) {