From 8c9902d30254bd6e07eb68a331bfcf99303d00f6 Mon Sep 17 00:00:00 2001 From: Kals1um Date: Thu, 9 Jan 2025 14:15:10 +0700 Subject: [PATCH] update laporan tindakan fahmi --- .../java/com/reporting/controller/ReportingController.java | 6 +++--- src/main/java/com/reporting/dao/ReportingDao.java | 3 ++- src/main/java/com/reporting/service/ReportingService.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/reporting/controller/ReportingController.java b/src/main/java/com/reporting/controller/ReportingController.java index 5cd42a2..aa4fa8e 100644 --- a/src/main/java/com/reporting/controller/ReportingController.java +++ b/src/main/java/com/reporting/controller/ReportingController.java @@ -352,11 +352,11 @@ public class ReportingController { @RequestMapping(value = {"/lap-tindakan"}, method = {RequestMethod.GET}) public void exportPdfLaporanTindakan( @RequestParam("ruanganid") Integer ruanganid, @RequestParam("instalasiid") Integer instalasiid, - @RequestParam("unitid") Integer unitid, @RequestParam("produkid") Integer produkid, - @RequestParam("statusprodukid") Integer statusprodukid, ModelAndView mv, + @RequestParam("kelasid") Integer kelasid, @RequestParam("unitid") Integer unitid, + @RequestParam("produkid") Integer produkid, @RequestParam("statusprodukid") Integer statusprodukid, ModelAndView mv, HttpServletRequest req, HttpServletResponse response) throws Exception { JasperPrint jasperPrint = this.reportingService - .printPdfLaporanTindakan(ruanganid, instalasiid, unitid, produkid, statusprodukid); + .printPdfLaporanTindakan(ruanganid, instalasiid, kelasid, unitid, produkid, statusprodukid); 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 a29662f..c4507eb 100644 --- a/src/main/java/com/reporting/dao/ReportingDao.java +++ b/src/main/java/com/reporting/dao/ReportingDao.java @@ -565,13 +565,14 @@ public class ReportingDao { } public JasperPrint exportPdfLaporanTindakan( - Integer ruanganid, Integer instalasiid, Integer unitid, Integer produkid, Integer statusprodukid) { + Integer ruanganid, Integer instalasiid, Integer kelasid, Integer unitid, Integer produkid, Integer statusprodukid) { try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()) { String path = jasperDirPath + "laporan_tindakan.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); Map parameters = new HashMap<>(); parameters.put("ruanganid", ruanganid ); parameters.put("instalasiid", instalasiid); + parameters.put("kelasid", kelasid); parameters.put("unitid", unitid); parameters.put("produkid", produkid); parameters.put("statusprodukid", statusprodukid); diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java index 4f22ad3..cd75f3b 100644 --- a/src/main/java/com/reporting/service/ReportingService.java +++ b/src/main/java/com/reporting/service/ReportingService.java @@ -159,8 +159,8 @@ public class ReportingService { return this.reportingDao.exportPdfLabelFarmasi(norec); } - public JasperPrint printPdfLaporanTindakan(Integer ruanganid, Integer instalasiid, Integer unitid, Integer produkid, Integer statusprodukid) { - return this.reportingDao.exportPdfLaporanTindakan(ruanganid, instalasiid, produkid, unitid, statusprodukid); + public JasperPrint printPdfLaporanTindakan(Integer ruanganid, Integer instalasiid, Integer kelasid, Integer unitid, Integer produkid, Integer statusprodukid) { + return this.reportingDao.exportPdfLaporanTindakan(ruanganid, instalasiid, kelasid, produkid, unitid, statusprodukid); } }