Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'develop' into feature/JDK11
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
jenkins
2025-05-28 16:35:31 +02:00
parent 00ea7f4e3a 9e4dea4e3c
commit f2405093de
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ems-engine/src/main/java/it/integry/ems/document/service/DocumentService.java
View File

@@ -2125,7 +2125,7 @@ public class DocumentService {
if (archiviazioneElettronica == null) archiviazioneElettronica = false;
List<byte[]> listPdf = new ArrayList<>();
for (int i = 0; i < dtbTipi.getNumCopie(); i++) {
for (int i = 1; i <= dtbTipi.getNumCopie(); i++) {
ReportTypeDTO reportTypeDto = new ReportTypeDTO()
.setCodDtip(codDtip)
.setReportType(reportType)
@@ -2141,7 +2141,7 @@ public class DocumentService {
continue;
listPdf.add(printedReport);
} else {
listPdf.add(generateReportFromCodDtip(printDocumentRequest, codDtip));
listPdf.add(generateReportFromCodDtip(printDocumentRequest, codDtip, i));
}
}
@@ -2246,7 +2246,7 @@ public class DocumentService {
return UtilityPdf.merge(listPdf);
}
private byte[] generateReportFromCodDtip(PrintDocumentRequestDTO printDocumentRequest, String codDtip) throws Exception {
private byte[] generateReportFromCodDtip(PrintDocumentRequestDTO printDocumentRequest, String codDtip, int numCopia) throws Exception {
String sql = it.integry.ems_model.utility.Query.format(
"SELECT wtb_jrept.report_name\n" +
"FROM dtb_mod_stampa\n" +
@@ -2264,7 +2264,7 @@ public class DocumentService {
JasperDTO jasperDTO = new JasperDTO()
.setReportId(reportProcessor.getReportID(reportName))
.setParams(printDocumentRequest.getReportParams(0));
.setParams(printDocumentRequest.getReportParams(numCopia));
return reportProcessor.processReport(jasperDTO);
}