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

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

@@ -261,27 +261,32 @@ 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) {
Long fileId = Long.valueOf(doc.getFileValue().toString()); if( Boolean.FALSE.equals(doc.getFileValue().isEmpty())) {
documentRepository.findByIdAndNotDeleted(fileId).ifPresent(documentEntity -> { Long fileId = Long.valueOf(doc.getFileValue().toString());
DocumentResponseBean documentResponseBean = new DocumentResponseBean(); documentRepository.findByIdAndNotDeleted(fileId).ifPresent(documentEntity -> {
documentResponseBean.setId(documentEntity.getId()); DocumentResponseBean documentResponseBean = new DocumentResponseBean();
documentResponseBean.setName(documentEntity.getFileName()); documentResponseBean.setId(documentEntity.getId());
documentResponseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType())); documentResponseBean.setName(documentEntity.getFileName());
documentResponseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource())); documentResponseBean.setType(DocumentTypeEnum.valueOf(documentEntity.getType()));
documentResponseBean.setSourceId(documentEntity.getSourceId()); documentResponseBean.setSource(DocumentSourceTypeEnum.valueOf(documentEntity.getSource()));
documentResponseBean.setFilePath(documentEntity.getFilePath()); documentResponseBean.setSourceId(documentEntity.getSourceId());
documentResponseBean.setCreatedDate(documentEntity.getCreatedDate()); documentResponseBean.setFilePath(documentEntity.getFilePath());
documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate()); documentResponseBean.setCreatedDate(documentEntity.getCreatedDate());
documentResponseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId()); documentResponseBean.setUpdatedDate(documentEntity.getUpdatedDate());
evaluationDocResponse.setFileValue(List.of(documentResponseBean)); documentResponseBean.setDocumentAttachmentId(documentEntity.getDocumentAttachmentId());
evaluationDocResponse.setNameValue(doc.getNameValue()); evaluationDocResponse.setFileValue(List.of(documentResponseBean));
evaluationDocResponse.setValid(doc.getValid()); });
evaluationDocResponse.setFieldId(doc.getFieldId()); }
}); else {
} evaluationDocResponse.setFileValue(null);
if (evaluationDocResponse.getFileValue() == null) { }
continue; evaluationDocResponse.setNameValue(doc.getNameValue());
evaluationDocResponse.setValid(doc.getValid());
evaluationDocResponse.setFieldId(doc.getFieldId());
} }
// 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) {
Long fileId = Long.valueOf(doc.getFileValue()); if(Boolean.FALSE.equals(doc.getFileValue().isEmpty())) {
documentService.validateDocument(fileId); Long fileId = Long.valueOf(doc.getFileValue());
documentService.validateDocument(fileId);
}
existingDocs.add(doc); existingDocs.add(doc);
} }
} }