From e1cd94e9693d4d820dbb7c9bd8a92378cb77cd6d Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 20 Feb 2024 13:11:46 +0700 Subject: [PATCH] Update PegawaiDao.java Perbaikan service notifikasi expired sip str --- .../java/com/jasamedika/medifirst2000/dao/PegawaiDao.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java index 635d4123..f045af2a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java @@ -668,7 +668,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join mapPegawai.pegawai p " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.id = :id " - + "and (tglBerakhirSip <= :date or p.isSipSeumurHidup is false) " + "order by tglBerakhirSip, namaLengkap") + + "and tglBerakhirSip <= :date " + "and p.isSipSeumurHidup is false " + + "order by tglBerakhirSip, namaLengkap") Map findSipExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (p.id as id, " + "p.tglBerakhirStr as tglBerakhirStr, " @@ -678,7 +679,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join mapPegawai.pegawai p " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.id = :id " - + "and (tglBerakhirStr <= :date or p.isStrSeumurHidup is false) " + "order by tglBerakhirStr, namaLengkap") + + "and tglBerakhirStr <= :date " + "and p.isStrSeumurHidup is false " + + "order by tglBerakhirStr, namaLengkap") Map findStrExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (unitKerja.name as unitKerja, count(pegawai.id) as value )"