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

Changes for evaluation document

Browse Source
This commit is contained in:
nisha
2025-03-17 19:04:34 +05:30
parent 82f668c08c
commit 8116bceffe
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,6 +261,7 @@ public class ApplicationEvaluationDao {
for (EvaluationDocumentRequest doc : docRequest) { for (EvaluationDocumentRequest doc : docRequest) {
EvaluationDocumentResponse evaluationDocResponse = new EvaluationDocumentResponse(); EvaluationDocumentResponse evaluationDocResponse = new EvaluationDocumentResponse();
if (doc.getFileValue() != null) { if (doc.getFileValue() != null) {
if( Boolean.FALSE.equals(doc.getFileValue().isEmpty())) {
Long fileId = Long.valueOf(doc.getFileValue().toString()); Long fileId = Long.valueOf(doc.getFileValue().toString());
documentRepository.findByIdAndNotDeleted(fileId).ifPresent(documentEntity -> { documentRepository.findByIdAndNotDeleted(fileId).ifPresent(documentEntity -> {
DocumentResponseBean documentResponseBean = new DocumentResponseBean(); DocumentResponseBean documentResponseBean = new DocumentResponseBean();
@@ -274,14 +275,18 @@ public class ApplicationEvaluationDao {
documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate()); documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate());
documentResponseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId()); documentResponseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
evaluationDocResponse.setFileValue(List.of(documentResponseBean)); evaluationDocResponse.setFileValue(List.of(documentResponseBean));
});
}
else {
evaluationDocResponse.setFileValue(null);
}
evaluationDocResponse.setNameValue(doc.getNameValue()); evaluationDocResponse.setNameValue(doc.getNameValue());
evaluationDocResponse.setValid(doc.getValid()); evaluationDocResponse.setValid(doc.getValid());
evaluationDocResponse.setFieldId(doc.getFieldId()); evaluationDocResponse.setFieldId(doc.getFieldId());
});
}
if (evaluationDocResponse.getFileValue() == null) {
continue;
} }
// if (evaluationDocResponse.getFileValue() == null) {
// continue;
// }
evaluationDocResponses.add(evaluationDocResponse); evaluationDocResponses.add(evaluationDocResponse);
} }
response.setEvaluationDocument(evaluationDocResponses); response.setEvaluationDocument(evaluationDocResponses);
@@ -1963,8 +1968,10 @@ public class ApplicationEvaluationDao {
for (EvaluationDocumentRequest doc : docRequest) { for (EvaluationDocumentRequest doc : docRequest) {
if (doc.getFileValue() != null) { if (doc.getFileValue() != null) {
if(Boolean.FALSE.equals(doc.getFileValue().isEmpty())) {
Long fileId = Long.valueOf(doc.getFileValue()); Long fileId = Long.valueOf(doc.getFileValue());
documentService.validateDocument(fileId); documentService.validateDocument(fileId);
}
existingDocs.add(doc); existingDocs.add(doc);
} }
} }