From aad140b2cadb8ae7f506f682cf42952251fe5811 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Fri, 17 Jan 2025 10:47:33 +0700
Subject: [PATCH] Update ListTanggalCutiDao.java

Penambahan validasi cuti belum disetujui hanya untuk pengajuan tahun sebelumnya
---
 .../com/jasamedika/medifirst2000/dao/ListTanggalCutiDao.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ListTanggalCutiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ListTanggalCutiDao.java
index 637de75f..ec07e90e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ListTanggalCutiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ListTanggalCutiDao.java
@@ -56,7 +56,8 @@ public interface ListTanggalCutiDao extends PagingAndSortingRepository<ListTangg
 	@Query("select tc from ListTanggalCuti tc " + "inner join tc.planningPegawaiStatus ps "
 			+ "where tc.statusEnabled is true " + "and ps.statusEnabled is true " + "and ps.noSkId is null "
 			+ "and ps.approvalStatus not in (1, 3) " + "and ps.pegawaiId = :idPegawai "
-			+ "and ps.statusPegawaiPlanId = :idJenisPermohonan " + "and tc.tgl between :tglAwal and :tglAkhir")
+			+ "and ps.statusPegawaiPlanId = :idJenisPermohonan " + "and tc.tgl between :tglAwal and :tglAkhir "
+			+ "and ps.tglPengajuan between :tglAwal and :tglAkhir")
 	List<ListTanggalCuti> notApprovedByPermohonan(@Param("idPegawai") Integer idPegawai,
 			@Param("idJenisPermohonan") Integer idJenisPermohonan, @Param("tglAwal") Date tglAwal,
 			@Param("tglAkhir") Date tglAkhir);