salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/pegawai/cuti' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-01-30 11:50:35 +07:00
commit 2a05bf5bcd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java
View File

@ -174,7 +174,7 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
// Hitung Absen di tanggal cuti bersama // Hitung Absen di tanggal cuti bersama
List<String> listTglCutiBersama = mapKalenderToHariLiburDao.getTglCutiBersama(year); List<String> listTglCutiBersama = mapKalenderToHariLiburDao.getTglCutiBersama(year);
int countDataHabsen = 0; int countDataHabsen = 0;
Date awal2024 = new Date(1704042000000L); Date awal2025 = new Date(1735664400000L);
for (String tglStr : listTglCutiBersama) { for (String tglStr : listTglCutiBersama) {
Date tglCheck; Date tglCheck;
try { try {
@ -214,7 +214,7 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
} else { } else {
countDataHabsen += 1; countDataHabsen += 1;
} }
} else if (tglCheck.before(awal2024)) { } else if (tglCheck.before(awal2025)) {
// cuti tahunan di tanggal cuti bersama // cuti tahunan di tanggal cuti bersama
List<Date> tglCutiTahunanDiTglCutiBersama = jatahCutiDanIzinDao List<Date> tglCutiTahunanDiTglCutiBersama = jatahCutiDanIzinDao
.getCutiTahunanDiTglCutiBersama(CUTI_TAHUNAN, pegawaiId, tglStr); .getCutiTahunanDiTglCutiBersama(CUTI_TAHUNAN, pegawaiId, tglStr);