diff --git a/src/main/java/com/reporting/controller/ReportingController.java b/src/main/java/com/reporting/controller/ReportingController.java index 11ddbb9..4dd12c3 100644 --- a/src/main/java/com/reporting/controller/ReportingController.java +++ b/src/main/java/com/reporting/controller/ReportingController.java @@ -303,8 +303,9 @@ public class ReportingController { public void exportKwitansi(@PathVariable("noregistrasi") String noregistrasi, @RequestParam(value = "jeniskwitansi", required = false) String jeniskwitansi, @RequestParam(value = "nama_pt", required = false) String nama_pt, + @RequestParam(value = "kasir", required = false) String kasir, ModelAndView mv, HttpServletResponse response) throws Exception { - JasperPrint jasperPrint = this.reportingService.exportPdfKwitansi(noregistrasi, jeniskwitansi, nama_pt); + JasperPrint jasperPrint = this.reportingService.exportPdfKwitansi(noregistrasi, jeniskwitansi, nama_pt, kasir); response.setContentType("application/pdf"); JasperExportManager.exportReportToPdfStream(jasperPrint, response.getOutputStream()); } diff --git a/src/main/java/com/reporting/dao/ReportingDao.java b/src/main/java/com/reporting/dao/ReportingDao.java index 30c01f5..eb306a1 100644 --- a/src/main/java/com/reporting/dao/ReportingDao.java +++ b/src/main/java/com/reporting/dao/ReportingDao.java @@ -1,5 +1,6 @@ package com.reporting.dao; + import net.sf.jasperreports.engine.*; import net.sf.jasperreports.engine.export.JRPrintServiceExporter; import net.sf.jasperreports.engine.type.OrientationEnum; @@ -397,12 +398,13 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKwitansi(String noregistrasi) { + public JasperPrint exportPdfKwitansi(String noregistrasi, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kwitansi.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKwitansi"); @@ -439,12 +441,13 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKwitansiNonL(String noregistrasi) { + public JasperPrint exportPdfKwitansiNonL(String noregistrasi, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kwitansi_nonLayanan.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKwitansiNonL"); @@ -453,12 +456,13 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKwidipo(String noregistrasi) { + public JasperPrint exportPdfKwidipo(String noregistrasi, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kwidipo.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKwidipo"); @@ -467,12 +471,13 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKemKwidipo(String noregistrasi) { + public JasperPrint exportPdfKemKwidipo(String noregistrasi, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kembalidiposit.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKemKwidipo"); @@ -481,13 +486,14 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKwitansiPT(String noregistrasi, String nama_pt) { + public JasperPrint exportPdfKwitansiPT(String noregistrasi, String nama_pt, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kwitansi_nama_pt.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); parameters.put("nama_pt", nama_pt); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKwitansiPT"); @@ -496,13 +502,14 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKwitansNonLiPT(String noregistrasi, String nama_pt) { + public JasperPrint exportPdfKwitansNonLiPT(String noregistrasi, String nama_pt, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kwitansi_nonLayanan_nama_pt.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); parameters.put("nama_pt", nama_pt); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKwitansNonLiPT"); @@ -511,12 +518,14 @@ public class ReportingDao { return null; } - public JasperPrint exportPdfKwitansTotal(String noregistrasi) { + public JasperPrint exportPdfKwitansTotal(String noregistrasi, String nama_pt, String kasir) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "kwitotal.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("noregistrasi", noregistrasi); + parameters.put("nama_pt", nama_pt); + parameters.put("kasir", kasir); return JasperFillManager.fillReport(jasperReport, parameters, conn); } catch (Exception var17) { LOG.error("Exception at exportPdfKwitansTotal"); @@ -525,6 +534,22 @@ public class ReportingDao { return null; } + public JasperPrint exportPdfKwitansTotalara(String noregistrasi, String nama_pt, String kasir) { + try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { + String path = jasperDirPath + "kwitotalara.jrxml"; + JasperReport jasperReport = JasperCompileManager.compileReport(path); + Map parameters = new HashMap<>(); + parameters.put("noregistrasi", noregistrasi); + parameters.put("nama_pt", nama_pt); + parameters.put("kasir", kasir); + return JasperFillManager.fillReport(jasperReport, parameters, conn); + } catch (Exception var17) { + LOG.error("Exception at exportPdfKwitansTotalara"); + LOG.error(ReportingDao.class, var17); + } + return null; + } + public JasperPrint exportPdfBuktiLayanan(String norec, String user) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "bukti_layanan.jrxml"; diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java index d10d345..6b8ac48 100644 --- a/src/main/java/com/reporting/service/ReportingService.java +++ b/src/main/java/com/reporting/service/ReportingService.java @@ -121,21 +121,23 @@ public class ReportingService { } } - public JasperPrint exportPdfKwitansi(String noregistrasi, String jeniskwitansi, String nama_pt) { + public JasperPrint exportPdfKwitansi(String noregistrasi, String jeniskwitansi, String nama_pt, String kasir) { if (Objects.equals(jeniskwitansi, "DEPOSIT")){ - return this.reportingDao.exportPdfKwidipo(noregistrasi); + return this.reportingDao.exportPdfKwidipo(noregistrasi, kasir); } else if (Objects.equals(jeniskwitansi, "NONLAYANAN")){ - return this.reportingDao.exportPdfKwitansiNonL(noregistrasi); + return this.reportingDao.exportPdfKwitansiNonL(noregistrasi, kasir); } else if (Objects.equals(jeniskwitansi, "KEMBALIDEPOSIT")){ - return this.reportingDao.exportPdfKemKwidipo(noregistrasi); + return this.reportingDao.exportPdfKemKwidipo(noregistrasi, kasir); } else if (Objects.equals(jeniskwitansi, "KWINAMA_PT")){ - return this.reportingDao.exportPdfKwitansiPT(noregistrasi, nama_pt); + return this.reportingDao.exportPdfKwitansiPT(noregistrasi, nama_pt, kasir); } else if (Objects.equals(jeniskwitansi, "NONLNAMA_PT")){ - return this.reportingDao.exportPdfKwitansNonLiPT(noregistrasi, nama_pt); + return this.reportingDao.exportPdfKwitansNonLiPT(noregistrasi, nama_pt, kasir); } else if (Objects.equals(jeniskwitansi, "KWITOTAL")){ - return this.reportingDao.exportPdfKwitansTotal(noregistrasi); + return this.reportingDao.exportPdfKwitansTotal(noregistrasi, nama_pt, kasir); + } else if (Objects.equals(jeniskwitansi, "KWITOTALAN")){ + return this.reportingDao.exportPdfKwitansTotalara(noregistrasi, nama_pt, kasir); } else { - return this.reportingDao.exportPdfKwitansi(noregistrasi); + return this.reportingDao.exportPdfKwitansi(noregistrasi, kasir); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 51e9818..55e6459 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,7 +6,7 @@ spring.datasource.username=postgres spring.datasource.password=root spring.mvc.dispatch-trace-request=true spring.main.banner-mode=off -application.jasper-xml.dir-path=/mnt/files/jasper-xml/ +application.jasper-xml.dir-path=D:\\UP\\ application.jasper-xml.dir-bintaro-path=/mnt/files/jasper-xml-bintaro/ application.pdf.dir-sep=/mnt/files/sep/ application.pdf.dir-lis=/mnt/lis/ \ No newline at end of file