From dc2e0548cb9d7e068a946119d553d59d59d7e421 Mon Sep 17 00:00:00 2001
From: nisha <nisha01kashyap01@gmail.com>
Date: Mon, 17 Mar 2025 16:36:58 +0530
Subject: [PATCH] Fixed issue in form field map

---
 .../tendermanagement/dao/ApplicationEvaluationDao.java        | 4 +++-
 .../gepafin/tendermanagement/dao/AssignedApplicationsDao.java | 1 +
 .../model/response/AssignedApplicationsResponse.java          | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index e43ef991..0fd56e6c 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -887,7 +887,9 @@ public class ApplicationEvaluationDao {
                 amendmentFormField.setValid(amendmentDetailsRequest.getValid());
             }
         });
-        applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(formFieldsMap.values().stream().toList()));
+        if(Boolean.FALSE.equals(CollectionUtils.isEmpty(formFieldsMap))) {
+            applicationAmendmentRequestEntity.setFormFields(Utils.convertListToJsonString(formFieldsMap.values().stream().toList()));
+        }
     }
 
 
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
index 1105a7fb..c09c0fb6 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/AssignedApplicationsDao.java
@@ -214,6 +214,7 @@ public class AssignedApplicationsDao {
         assignedApplicationsResponse.setAppointmentTemplateId(application.getCall().getAppointmentTemplateId());
         assignedApplicationsResponse.setNdg(application.getNdg());
         assignedApplicationsResponse.setAppointmentId(application.getAppointmentId());
+        assignedApplicationsResponse.setApplicationStatus(ApplicationStatusTypeEnum.valueOf(application.getStatus()));
         return assignedApplicationsResponse;
     }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
index 7f80e8f0..58a6e7da 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java
@@ -1,6 +1,8 @@
 package net.gepafin.tendermanagement.model.response;
 
+import com.amazonaws.services.dynamodbv2.xspec.S;
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
@@ -28,6 +30,7 @@ public class AssignedApplicationsResponse extends BaseBean {
     private EvaluationVersionEnum evaluationVersion;
     private String ndg;
     private String appointmentId;
+    private ApplicationStatusTypeEnum applicationStatus;
 }