diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java index e427a0d79..a5bc915e6 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java @@ -249,7 +249,9 @@ public class DownloadPreparationService { private String createFileName(FileEntity fileStatus, ReportTemplateEntity reportTemplate) { if (fileStatus != null) { - return removeExtension(fileStatus.getFilename()) + getExtension(reportTemplate.getFileName()); + var isFileApproved = WorkflowStatus.APPROVED.equals(fileStatus.getWorkflowStatus()); + String filename = isFileApproved ? fileStatus.getFilename() : "UNAPPROVED_" + fileStatus.getFilename(); + return removeExtension(filename) + getExtension(reportTemplate.getFileName()); } else { return reportTemplate.getFileName(); }