From 709d40e032e935a398f102371e2e5a1713c7259d Mon Sep 17 00:00:00 2001 From: nisha Date: Fri, 13 Dec 2024 17:48:02 +0530 Subject: [PATCH] Updated code for file detail in amendment --- .../dao/ApplicationAmendmentRequestDao.java | 10 ++++++---- .../model/response/AmendmentDocumentResponse.java | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 24a9a72f..5ef0044c 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -376,10 +376,12 @@ public class ApplicationAmendmentRequestDao { amendmentDocumentResponse.setFieldId(amendmentFieldRequest.getFieldId()); amendmentDocumentResponse.setNameValue(amendmentFieldRequest.getNameValue()); amendmentDocumentResponse.setValid(amendmentFieldRequest.getValid()); - - DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); - DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); - amendmentDocumentResponse.setFileValue(responseBean); + amendmentDocumentResponse.setFileValue(null); + if(amendmentFieldRequest.getFileValue()!=null) { + DocumentEntity documentEntity = documentService.validateDocument(Long.valueOf(amendmentFieldRequest.getFileValue())); + DocumentResponseBean responseBean = applicationEvaluationDao.createDocumentResponseBean(documentEntity); + amendmentDocumentResponse.setFileValue(List.of(responseBean)); + } return amendmentDocumentResponse; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java index 528b3492..45680a64 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AmendmentDocumentResponse.java @@ -2,11 +2,13 @@ package net.gepafin.tendermanagement.model.response; import lombok.Data; +import java.util.List; + @Data public class AmendmentDocumentResponse { private String fieldId; private String nameValue; - private DocumentResponseBean fileValue; + private List fileValue; private Boolean valid = false; }