From d730bcf6c3cb069516ef0c689edb97a3a8ebc6ad Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 7 Feb 2022 16:32:56 +0700 Subject: [PATCH] Update LogbookKinerjaDetailService Penyesuaian widget working record aplikasi remunerasi dapat digunakan oleh pegawai blu pkwt --- .../com/jasamedika/medifirst2000/constants/Master.java | 3 ++- .../service/impl/LogbookKinerjaDetailServiceImpl.java | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index cb649a95..ca6eba46 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -149,6 +149,7 @@ public class Master { public static final Integer[] PURNA_WAKTU = { 1, 2, 10, 14 }; public static final Integer[] REMUN = { 1, 10, 14 }; + public static final Integer BLU_PKWT = 2; public static final Integer DOKTER_TAMU = 19; public static final Integer PNS = 1; public static final Integer MITRA = 16; @@ -165,7 +166,7 @@ public class Master { public static final class Kelas { public static final Integer[] KELAS_DUA_TIGA_NONKELAS = { 1, 2, 6 }; public static final Integer[] KELAS_SATU_VIP = { 3, 5, 8, 21 }; - public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8, 21 }; + public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 }; public static final Integer KELAS_DUA = 2; public static final Integer KELAS_SATU = 3; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java index a885b66d..5d695591 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java @@ -231,9 +231,12 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement DateFormat mf = new SimpleDateFormat("yyyy-MM"); + List listKategoriPegawaiWorkingRecord = new ArrayList<>(); + listKategoriPegawaiWorkingRecord.addAll(Arrays.asList(Master.KategoryPegawai.REMUN)); + listKategoriPegawaiWorkingRecord.add(Master.KategoryPegawai.BLU_PKWT); + List> tugasVerifikasi = logbookKinerjaDetailDao.findVerifWorkingRecord(idPegawai, - mf.format(new Date(bulan)), Arrays.asList(Master.KategoryPegawai.REMUN), - Arrays.asList(Master.UnitKerja.KSM)); + mf.format(new Date(bulan)), listKategoriPegawaiWorkingRecord, Arrays.asList(Master.UnitKerja.KSM)); if (CommonUtil.isNotNullOrEmpty(tugasVerifikasi) && tugasVerifikasi.size() == 2) { for (Map tv : tugasVerifikasi) { if (Boolean.valueOf(tv.get("statusVerifikasi").toString())) { @@ -259,7 +262,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement result.put("tugasVerifikasi", rsMap1); List> statusVerifikasi = logbookKinerjaDetailDao.findVerifWorkingRecord(idPegawai, - mf.format(new Date(bulan)), Arrays.asList(Master.KategoryPegawai.REMUN)); + mf.format(new Date(bulan)), listKategoriPegawaiWorkingRecord); if (CommonUtil.isNotNullOrEmpty(statusVerifikasi) && statusVerifikasi.size() == 2) { for (Map sv : statusVerifikasi) { if (Boolean.valueOf(sv.get("statusVerifikasi").toString())) {