From f9561b6370053c6a087829d61bb929366cb85aa0 Mon Sep 17 00:00:00 2001 From: adesyawal <52590145+adesyawal@users.noreply.github.com> Date: Tue, 7 Jul 2026 18:33:03 +0700 Subject: [PATCH] Add Master Shift Kerja Pagi Malem 2 --- .../com/jasamedika/medifirst2000/constants/Master.java | 2 +- .../service/impl/MonitoringAbsenServiceImpl.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 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 da90dc53..04807c23 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 @@ -393,7 +393,7 @@ public final class Master { public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x"; public static final Integer[] PSM = { 31, 47, 106, 203, 204 }; // id shift kerja -> ada penambahan 203, 204 public static final Integer RESET = 0; - public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204}; // id shift kerja -> ada penambahan 203, 204 + public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204, 216, 313, 314, 315, 316}; // id shift kerja -> ada penambahan 203, 204 } public static final class StatusPegawai { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java index 72bb7c0b..f3c5ee1c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java @@ -943,8 +943,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon e.printStackTrace(); } - if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) - || (data.get("namaShift").equals("Non Shift MOD")))) { + if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) { try { List> listAbsensiPagi = new ArrayList<>(); List> listAbsensiPM = new ArrayList<>(); @@ -952,7 +951,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon Map detailShiftPMPagi = new HashMap<>(); Map detailShiftPMMalam = new HashMap<>(); - if ((data.get("namaShift").equals("Pagi Malam"))) { + if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) { detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail( Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P"); detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail( @@ -1686,7 +1685,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon e.printStackTrace(); } - if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Non Shift MOD")))) { + if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) { //if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && (data.get("namaShift").equals("Non Shift MOD"))) { try { List> listAbsensiPagi = new ArrayList<>(); @@ -1695,7 +1694,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon Map detailShiftPMPagi = new HashMap<>(); Map detailShiftPMMalam = new HashMap<>(); - if ((data.get("namaShift").equals("Pagi Malam"))) { + if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) { detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail( Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P"); detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(