From bda72546b6edb087f1c0787846fe43a9a09355ff Mon Sep 17 00:00:00 2001 From: salmanoe Date: Thu, 18 Mar 2021 14:51:55 +0700 Subject: [PATCH] penambahan surat izin cuti kepada direktur utama rsab --- .../service/impl/ReportServiceImpl.java | 8 + .../controller/ReportingController.java | 2 +- .../jrxml/lapPermohonanCuti2021.jrxml | 211 +++++++++++++++++- .../lapPermohonanCutiLuarNegeri2021.jrxml | 210 ++++++++++++++++- .../src/main/webapp/WEB-INF/web.xml | 2 +- 5 files changed, 429 insertions(+), 4 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index cdcc31e4..96c5fddd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -2132,6 +2132,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus)) { result.put("statusPegawaiPlanId", planningPegawaiStatus.getStatusPegawaiPlanId().toString()); + result.put("statusPegawai", statusPegawai.getStatusPegawai()); if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus) && (!statusPegawai.getStatusPegawai().equals("Cuti Besar") || !statusPegawai.getStatusPegawai().equals("Cuti Melahirkan") @@ -2190,14 +2191,21 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic Map pegawai = pegawaiDao.findPegawaiById(planningPegawaiStatus.getPegawai().getId()); if (CommonUtil.isNotNullOrEmpty(pegawai.get("tglMasuk"))) { result.put("masaKerja", pegawaiService.hitungMasaKerja((Date) pegawai.get("tglMasuk"))); + result.put("tglMasuk", new SimpleDateFormat("dd MMMM yyyy", new Locale("id")) + .format((Date) pegawai.get("tglMasuk"))); } else { result.put("masaKerja", "-"); + result.put("tglMasuk", ""); } Jabatan jabatan = jabatanDao.findOne(idJabatan); UnitKerjaPegawai unitKerja = unitKerjaDao.findOne(idUnitKerja); result.put("nama", pegawai.get("nama")); result.put("nip", pegawai.get("nipPns")); result.put("pangkat", pegawai.get("namaGolongan")); + if (CommonUtil.isNotNullOrEmpty(pegawai.get("namaPangkat")) + && CommonUtil.isNotNullOrEmpty(pegawai.get("namaGolongan"))) { + result.put("pangkatGol", pegawai.get("namaPangkat") + "/ " + pegawai.get("namaGolongan")); + } result.put("jabatan", jabatan.getNamaJabatan()); result.put("departemen", pegawai.get("departemen")); result.put("alamat", planningPegawaiStatus.getAlamatCuti()); diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index ff380b63..33bbc564 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -6544,7 +6544,7 @@ public class ReportingController extends LocaleController } @RequestMapping("/lapPermohonanCuti") - public ModelAndView generateAllRlapCapaianKinerja(ModelAndView m, + public ModelAndView generateLapPermohonanCuti(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noRecPlanning", required = true) String noRecPlanning, @RequestParam(value = "idJabatan", required = false, defaultValue = "0") Integer idJabatan, diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml index f337ae3e..23818fe3 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml @@ -64,8 +64,11 @@ + + + - + @@ -1225,5 +1228,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml index c5d70028..69a80f52 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml @@ -73,6 +73,7 @@ + @@ -1164,7 +1165,8 @@ - + + @@ -1402,5 +1404,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml b/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml index d848a0af..73911d37 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - mirroring + development