diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java index 3aa9f92b..da7142b3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java @@ -12,6 +12,7 @@ import com.jasamedika.medifirst2000.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; @@ -173,7 +174,14 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService { // Hitung Absen di tanggal cuti bersama List listTglCutiBersama = mapKalenderToHariLiburDao.getTglCutiBersama(year); int countDataHabsen = 0; + Date awal2024 = new Date(1704042000000L); for (String tglStr : listTglCutiBersama) { + Date tglCheck; + try { + tglCheck = sdf.parse(tglStr); + } catch (ParseException e) { + tglCheck = new Date(); + } List dataHabsen = new ArrayList<>(); // cek shift malam String tglPrev = sdf.format(java.sql.Date.valueOf(LocalDate.parse(tglStr).minusDays(1))); @@ -206,7 +214,7 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService { } else { countDataHabsen += 1; } - } else { + } else if (tglCheck.before(awal2024)) { // cuti tahunan di tanggal cuti bersama List tglCutiTahunanDiTglCutiBersama = jatahCutiDanIzinDao .getCutiTahunanDiTglCutiBersama(CUTI_TAHUNAN, pegawaiId, tglStr);