diff --git a/src/main/java/com/reporting/controller/ReportingController.java b/src/main/java/com/reporting/controller/ReportingController.java index d52cadd..9e3e8aa 100644 --- a/src/main/java/com/reporting/controller/ReportingController.java +++ b/src/main/java/com/reporting/controller/ReportingController.java @@ -489,9 +489,12 @@ public class ReportingController { @RequestParam(value = "jabatanMengetahui", required = false, defaultValue = "") String jabatanMengetahui, @RequestParam(value = "jabatanMenerima", required = false, defaultValue = "") String jabatanMenerima, @RequestParam(value = "pegawaiMenerima", required = false, defaultValue = "") String pegawaiMenerima, + @RequestParam(value = "nipMenyerahkan", required = false, defaultValue = "") String nipMenyerahkan, + @RequestParam(value = "nipMengetahui", required = false, defaultValue = "") String nipMengetahui, + @RequestParam(value = "nipMenerima", required = false, defaultValue = "") String nipMenerima, @RequestParam(value = "printBy", required = false, defaultValue = "") String printBy, ModelAndView mv, HttpServletResponse response) throws Exception { - JasperPrint jasperPrint = this.reportingService.exportPdfdaftarPenerimaBarangFarmasi(norec, pegawaiMenyerahkan, jabatanMenyerahkan, pegawaiMengetahui, jabatanMengetahui, jabatanMenerima, pegawaiMenerima, printBy); + JasperPrint jasperPrint = this.reportingService.exportPdfdaftarPenerimaBarangFarmasi(norec, pegawaiMenyerahkan, jabatanMenyerahkan, pegawaiMengetahui, jabatanMengetahui, jabatanMenerima, pegawaiMenerima, nipMenyerahkan, nipMengetahui, nipMenerima, printBy); 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 bdadddf..0a48161 100644 --- a/src/main/java/com/reporting/dao/ReportingDao.java +++ b/src/main/java/com/reporting/dao/ReportingDao.java @@ -848,7 +848,7 @@ public class ReportingDao { // Bukti penerima barang suplier public JasperPrint exportPdfdaftarPenerimaBarangFarmasi(String norec, String pegawaiMenyerahkan, String jabatanMenyerahkan, String pegawaiMengetahui, String jabatanMengetahui, - String jabatanMenerima, String pegawaiMenerima, String printBy){ + String jabatanMenerima, String pegawaiMenerima, String nipMenyerahkan, String nipMengetahui, String nipMenerima, String printBy){ try (Connection conn = this.jdbcTemplate1.getDataSource().getConnection()){ String path = jasperDirPath + "daftar_penerimaan_barang_dari_suplier_dong.jrxml"; JasperReport jasperReport = JasperCompileManager.compileReport(path); @@ -860,6 +860,9 @@ public class ReportingDao { parameters.put("jabatanMengetahui", jabatanMengetahui); parameters.put("jabatanMenerima", jabatanMenerima); parameters.put("pegawaiMenerima", pegawaiMenerima); + parameters.put("nipMenyerahkan", nipMenyerahkan); + parameters.put("nipMengetahui", nipMengetahui); + parameters.put("nipMenerima", nipMenerima); parameters.put("printBy", printBy); return JasperFillManager.fillReport(jasperReport, parameters, conn); }catch (Exception e){ diff --git a/src/main/java/com/reporting/service/ReportingService.java b/src/main/java/com/reporting/service/ReportingService.java index 9e65f58..10c073d 100644 --- a/src/main/java/com/reporting/service/ReportingService.java +++ b/src/main/java/com/reporting/service/ReportingService.java @@ -249,8 +249,8 @@ public class ReportingService { } public JasperPrint exportPdfdaftarPenerimaBarangFarmasi(String norec, String pegawaiMenyerahkan, String jabatanMenyerahkan, String pegawaiMengetahui, String jabatanMengetahui, - String jabatanMenerima, String pegawaiMenerima, String printBy){ - return this.reportingDao.exportPdfdaftarPenerimaBarangFarmasi(norec, pegawaiMenyerahkan, jabatanMenyerahkan, pegawaiMengetahui, jabatanMengetahui, jabatanMenerima, pegawaiMenerima, printBy); + String jabatanMenerima, String pegawaiMenerima, String nipMenyerahkan, String nipMengetahui, String nipMenerima, String printBy){ + return this.reportingDao.exportPdfdaftarPenerimaBarangFarmasi(norec, pegawaiMenyerahkan, jabatanMenyerahkan, pegawaiMengetahui, jabatanMengetahui, jabatanMenerima, pegawaiMenerima, nipMenyerahkan, nipMengetahui, nipMenerima, printBy); }