From 89e97c49c5326b9cbca395a7fe9236649bc698cc Mon Sep 17 00:00:00 2001 From: rajesh Date: Wed, 1 Oct 2025 13:16:18 +0530 Subject: [PATCH] Fixed issue in new amendment --- .../dao/ApplicationAmendmentRequestDao.java | 16 +++++++++++----- src/main/resources/application-dev.properties | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 080ed3d1..2ab22d1f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -735,13 +735,19 @@ public class ApplicationAmendmentRequestDao { ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment); setIfUpdated(existingApplicationAmendment::getNote, existingApplicationAmendment::setNote, updateRequest.getNote()); + Map amendmentFormFieldMap; + Map applicationFormFieldMap=null; + if(existingApplicationAmendment.getFormFields()!=null && Boolean.FALSE.equals(existingApplicationAmendment.getFormFields().isEmpty())) { + amendmentFormFieldMap = Utils + .convertJsonStringToList(existingApplicationAmendment.getFormFields(), AmendmentFormField.class) + .stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity())); + applicationFormFieldMap = getApplicationFormFieldList(existingApplicationAmendment, amendmentFormFieldMap.keySet().stream().toList()).stream().collect(Collectors.toMap(ApplicationFormFieldEntity::getFieldId, Function.identity())); - Map amendmentFormFieldMap = Utils - .convertJsonStringToList(existingApplicationAmendment.getFormFields(), AmendmentFormField.class) - .stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity())); - Map applicationFormFieldMap = getApplicationFormFieldList(existingApplicationAmendment, amendmentFormFieldMap.keySet().stream().toList()).stream().collect(Collectors.toMap(ApplicationFormFieldEntity::getFieldId, Function.identity())); + } else { + amendmentFormFieldMap = null; + } - if(updateRequest.getApplicationFormFields() != null) { + if(updateRequest.getApplicationFormFields() != null && amendmentFormFieldMap!=null) { updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{ AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId()); // ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId()); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index bc453374..80e20599 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -10,7 +10,7 @@ spring.h2.console.enabled=true isVatCheckGloballyDisabled = false isMailSendingEnabled = true -isPecServiceEnabled = false +isPecServiceEnabled = true #default_System_Receiver_Email=antonio.manca@bflows.net gepafin_email=rinaldo.bonazzo@bflows.net rinaldo_email=rinaldo.bonazzo@bflows.net