Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Pull request #129: RED-3230: Placeholders in report for excluded file

Browse Source 
Merge in RED/redaction-report-service from RED-3230-rrs2 to master

* commit '845ca0695ae54d03a3b180dbc4d1a6b27535fbb8':
  RED-3230: Placeholders in report for excluded file
This commit is contained in:
Ali Oezyetimoglu 2022-01-18 14:41:00 +01:00
commit 45f9f7255e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java
View File

@ -160,10 +160,6 @@ public class ExcelTemplateReportGenerationService {
private void addEntryRows(Sheet sheet, List<ReportRedactionEntry> reportEntries, String filename,
boolean isLastFile) {
if (reportEntries.isEmpty()) {
return;
}
if (sheet == null) {
return;
}
@ -200,15 +196,22 @@ public class ExcelTemplateReportGenerationService {
sheet.shiftRows(rowIndex.get(), rowIndex.get() + reportEntries.size(), reportEntries.size(), true, true);
}
reportEntries.forEach(entry -> {
if(reportEntries.isEmpty()) {
sheet.createRow(rowIndex.get());
for (Map.Entry<Integer, String> entry1 : placeholderCellPos.entrySet()) {
sheet.getRow(rowIndex.get())
.createCell(entry1.getKey())
.setCellValue(replaceTextPlaceholderWithEntries(entry, filename, entry1.getValue()));
sheet.getRow(rowIndex.get()).createCell(entry1.getKey()).setCellValue("");
}
rowIndex.getAndIncrement();
});
} else {
reportEntries.forEach(entry -> {
sheet.createRow(rowIndex.get());
for (Map.Entry<Integer, String> entry1 : placeholderCellPos.entrySet()) {
sheet.getRow(rowIndex.get()).createCell(entry1.getKey()).setCellValue(replaceTextPlaceholderWithEntries(entry, filename, entry1.getValue()));
}
rowIndex.getAndIncrement();
});
}
}
}