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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-11-18 13:18:59 +01:00
parent eede5ab023 1838dd28eb
commit 8397ffd1bf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-core/src/main/java/it/integry/ems/service/ReportProcessor.java
View File

@@ -249,7 +249,12 @@ public class ReportProcessor {
if (jasperDTO.getReportId() != null && UtilityString.isNullOrEmpty(jasperDTO.getB64ReportJrxml())) {
//Refill
jasperDTO = getReportByID(jasperDTO.getReportId(), jasperDTO.getParams());
JasperDTO jasperTmp = getReportByID(jasperDTO.getReportId());
jasperDTO.setCompiledJasper(jasperTmp.getCompiledJasper())
.setReportId(jasperTmp.getReportId())
.setB64ReportJrxml(jasperTmp.getB64ReportJrxml())
.setSubreports(jasperTmp.getSubreports());
if (jasperDTO.getOrientation() == null) {
String sql = "SELECT orientation FROM " + WtbJrept.ENTITY + " WHERE id = " + UtilityDB.valueToString(jasperDTO.getReportId());
@@ -431,7 +436,7 @@ public class ReportProcessor {
return paramsMap;
}
private JasperDTO getReportByID(Long reportId, List<PairsDTO> params) throws Exception {
private JasperDTO getReportByID(Long reportId) throws Exception {
String sql = "SELECT id, " +
" CONVERT(TEXT, b64_jrxml) AS b64_jrxml," +
" compiled_jasper " +
@@ -443,7 +448,6 @@ public class ReportProcessor {
if (result == null) throw new Exception("Report non valido");
JasperDTO jasperDTO = new JasperDTO()
.setParams(params)
.setReportId(UtilityHashMap.getValueIfExists(result, "id"))
.setB64ReportJrxml(UtilityHashMap.getValueIfExists(result, "b64_jrxml"))
.setCompiledJasper(UtilityHashMap.getValueIfExists(result, "compiled_jasper"));