From f7185106392d4c8529aaa171be0b8cb6574ee6f8 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 19 Feb 2024 11:41:01 +0700 Subject: [PATCH] Update PegawaiDao.java Perbaikan kondisi untuk validasi kombinasi tanggal expired dan checklist berlaku seumur hidup --- .../com/jasamedika/medifirst2000/dao/PegawaiDao.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 c775093c..9db257d4 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 @@ -666,9 +666,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "unitKerja.name as unitKerja) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "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.isSipSeumurHidup is true " + "and p.id = :id " + "and tglBerakhirSip <= :date " - + "order by tglBerakhirSip, namaLengkap") + + "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") Map findSipExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (p.id as id, " + "p.tglBerakhirStr as tglBerakhirStr, " @@ -677,9 +676,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "unitKerja.name as unitKerja) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "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.isStrSeumurHidup is false " + "and p.id = :id " + "and tglBerakhirStr <= :date " - + "order by tglBerakhirStr, namaLengkap") + + "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") Map findStrExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (unitKerja.name as unitKerja, count(pegawai.id) as value )"