diff --git a/src/main/java/com/reporting/controller/ReportingController.java b/src/main/java/com/reporting/controller/ReportingController.java index d37d6d5..3590b54 100644 --- a/src/main/java/com/reporting/controller/ReportingController.java +++ b/src/main/java/com/reporting/controller/ReportingController.java @@ -336,17 +336,15 @@ public class ReportingController { response.setContentType("application/pdf"); JasperExportManager.exportReportToPdfStream(jasperPrint, response.getOutputStream()); } -/* - @RequestMapping(value = {"/bukti-layanan-farmasi/{norec}/{user}"}, method = {RequestMethod.GET}) + @RequestMapping(value = {"/bukti-layanan-farmasi/{norec}"}, method = {RequestMethod.GET}) public void exportPdfBuktiLayanan(@PathVariable("norec") String norec, - @PathVariable("user") String user, + @RequestParam(value = "user", required = false, defaultValue = "") String user, ModelAndView mv, HttpServletResponse response) throws Exception { JasperPrint jasperPrint = this.reportingService.exportPdfBuktiLayanan(norec, user); response.setContentType("application/pdf"); JasperExportManager.exportReportToPdfStream(jasperPrint, response.getOutputStream()); } -*/ @RequestMapping(value = {"/bukti-nonlayanan-farmasi/{norec}"}, method = {RequestMethod.GET}) public void exportPdfBuktiNoLayanFarmasi(@PathVariable("norec") String norec, diff --git a/src/main/java/com/reporting/dao/ReportingDao.java b/src/main/java/com/reporting/dao/ReportingDao.java index ce784c6..f02a8dd 100644 --- a/src/main/java/com/reporting/dao/ReportingDao.java +++ b/src/main/java/com/reporting/dao/ReportingDao.java @@ -620,7 +620,6 @@ public class ReportingDao { } return null; } -/* public JasperPrint exportPdfBuktiLayanan(String norec, String user) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { @@ -636,7 +635,6 @@ public class ReportingDao { } return null; } -*/ public JasperPrint exportPdfBuktiNoLayanFarmasi(String norec) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java index bb221be..4315e30 100644 --- a/src/main/java/com/reporting/service/ReportingService.java +++ b/src/main/java/com/reporting/service/ReportingService.java @@ -175,12 +175,10 @@ public class ReportingService { return this.reportingDao.exportPdfSppb(norec); } } -/* public JasperPrint exportPdfBuktiLayanan(String norec, String user) { return this.reportingDao.exportPdfBuktiLayanan(norec, user); } -*/ public JasperPrint exportPdfBuktiNoLayanFarmasi(String norec) { return this.reportingDao.exportPdfBuktiNoLayanFarmasi(norec);