Merge branch 'ade/bug-fixing/master-shift-on-cuti' into prod/base

This commit is contained in:
adesyawal 2025-11-06 15:04:09 +07:00
commit f152385e55

View File

@ -71,8 +71,8 @@ public interface PegawaiJadwalKerjaDao extends PagingAndSortingRepository<Pegawa
@Query("select new Map(shiftKerja.id as idShift, shiftKerja.namaShift as namaShift) "
+ "from PegawaiJadwalKerja jadwalKerja " + "inner join jadwalKerja.shift shiftKerja "
+ "left join jadwalKerja.tanggal kalender " + "where shiftKerja.statusEnabled is true "
+ "and to_char(kalender.tanggal, 'yyyy-MM-dd') between :tgl1 and :tgl2 "
+ "left join jadwalKerja.tanggal kalender "
+ "where to_char(kalender.tanggal, 'yyyy-MM-dd') between :tgl1 and :tgl2 "
+ "and jadwalKerja.pegawaiId = :idPegawai " + "order by to_char(kalender.tanggal, 'yyyy-MM-dd')")
List<Map<String, Object>> getNamaShiftKerjaPegawaiByTanggal(@Param("tgl1") String tgl1, @Param("tgl2") String tgl2,
@Param("idPegawai") Integer idPegawai);