From f3183adbb3644d7a2503fad2b4c3804482427b3d Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 9 Jan 2023 20:08:17 +0700 Subject: [PATCH] Update MonitoringAbsenServiceImpl.java Perbaikan Monitoring absensi tidak tampil karena duplikat pengajuan cuti --- .../medifirst2000/dao/PegawaiHistoriRekapIndexDao.java | 2 +- .../service/impl/MonitoringAbsenServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiHistoriRekapIndexDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiHistoriRekapIndexDao.java index 2da48285..54f0f71a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiHistoriRekapIndexDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiHistoriRekapIndexDao.java @@ -45,7 +45,7 @@ public interface PegawaiHistoriRekapIndexDao extends PagingAndSortingRepository< + "where planning.noRec = pegawaiHistori.noRecPlanningPerubahanStatus " + "and komponenIndex.id in (:listKomponenIndex) " + "and pegawai.id = :idPegawai " + "and to_char(listTanggal.tgl,'yyyy-MM-dd') = :date " + "and listTanggal.approvalStatus is true") - public Map getPegawaiHistoriRekapIndexByDate(@Param("idPegawai") Integer idPegawai, + public List> getPegawaiHistoriRekapIndexByDate(@Param("idPegawai") Integer idPegawai, @Param("listKomponenIndex") List listKomponenIndex, @Param("date") String date); @Query("select count(distinct rekInd.noRec) " + "from PegawaiHistoriRekapIndex rekInd, " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java index bba77de4..8ee0994b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java @@ -2231,7 +2231,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon @Transactional(readOnly = true) public String cuti(Integer idPegawai, String tgl) { - Map alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate( + List> alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate( idPegawai, splitDataSettingDatafixed("komponenIndeksKetidakhadiran"), tgl); if (CommonUtil.isNullOrEmpty(alasanKetidakhadiran)) { alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate(idPegawai, @@ -2239,8 +2239,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon } String cuti = ""; if (CommonUtil.isNotNullOrEmpty(alasanKetidakhadiran)) { - if (CommonUtil.isNotNullOrEmpty(alasanKetidakhadiran.get("noRecHistory"))) { - cuti = alasanKetidakhadiran.get("alasan").toString(); + if (CommonUtil.isNotNullOrEmpty(alasanKetidakhadiran.get(0).get("noRecHistory"))) { + cuti = alasanKetidakhadiran.get(0).get("alasan").toString(); } }