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

Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop

Browse Source
This commit is contained in:
rajesh
2025-10-01 19:02:15 +05:30
parent 129c0a59df 68e4d57e72
commit e34bb811ab
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -735,13 +735,19 @@ public class ApplicationAmendmentRequestDao {
ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment); ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment);
setIfUpdated(existingApplicationAmendment::getNote, existingApplicationAmendment::setNote, updateRequest.getNote()); setIfUpdated(existingApplicationAmendment::getNote, existingApplicationAmendment::setNote, updateRequest.getNote());
Map<String, AmendmentFormField> amendmentFormFieldMap;
Map<String, ApplicationFormFieldEntity> 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<String, AmendmentFormField> amendmentFormFieldMap = Utils } else {
.convertJsonStringToList(existingApplicationAmendment.getFormFields(), AmendmentFormField.class) amendmentFormFieldMap = null;
.stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity())); }
Map<String, ApplicationFormFieldEntity> applicationFormFieldMap = getApplicationFormFieldList(existingApplicationAmendment, amendmentFormFieldMap.keySet().stream().toList()).stream().collect(Collectors.toMap(ApplicationFormFieldEntity::getFieldId, Function.identity()));
if(updateRequest.getApplicationFormFields() != null) { if(updateRequest.getApplicationFormFields() != null && amendmentFormFieldMap!=null) {
updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{ updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{
AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId()); AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId());
// ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId()); // ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId());

3
src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
View File

@@ -17,7 +17,8 @@ public enum ApplicationStatusTypeEnum {
NDG("NDG"), NDG("NDG"),
ADMISSIBLE("ADMISSIBLE"), ADMISSIBLE("ADMISSIBLE"),
TECHNICAL_EVALUATION("TECHNICAL_EVALUATION"), TECHNICAL_EVALUATION("TECHNICAL_EVALUATION"),
TECHNICAL_EVALUATION_REJECTED("TECHNICAL_EVALUATION_REJECTED"); TECHNICAL_EVALUATION_REJECTED("TECHNICAL_EVALUATION_REJECTED"),
AWAITING_TECHNICAL_EVALUATION("AWAITING_TECHNICAL_EVALUATION") ;
private String value; private String value;

2
src/main/resources/application-dev.properties
View File

@@ -10,7 +10,7 @@ spring.h2.console.enabled=true
isVatCheckGloballyDisabled = false isVatCheckGloballyDisabled = false
isMailSendingEnabled = true isMailSendingEnabled = true
isPecServiceEnabled = false isPecServiceEnabled = true
#default_System_Receiver_Email=antonio.manca@bflows.net #default_System_Receiver_Email=antonio.manca@bflows.net
gepafin_email=rinaldo.bonazzo@bflows.net gepafin_email=rinaldo.bonazzo@bflows.net
rinaldo_email=rinaldo.bonazzo@bflows.net rinaldo_email=rinaldo.bonazzo@bflows.net