Update MonitoringAbsenServiceImpl.java
Perbaikan Monitoring absensi tidak tampil karena duplikat pengajuan cuti
This commit is contained in:
parent
d7f6f4ba56
commit
f3183adbb3
@ -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<String, Object> getPegawaiHistoriRekapIndexByDate(@Param("idPegawai") Integer idPegawai,
|
||||
public List<Map<String, Object>> getPegawaiHistoriRekapIndexByDate(@Param("idPegawai") Integer idPegawai,
|
||||
@Param("listKomponenIndex") List<Integer> listKomponenIndex, @Param("date") String date);
|
||||
|
||||
@Query("select count(distinct rekInd.noRec) " + "from PegawaiHistoriRekapIndex rekInd, "
|
||||
|
||||
@ -2231,7 +2231,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public String cuti(Integer idPegawai, String tgl) {
|
||||
Map<String, Object> alasanKetidakhadiran = pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndexByDate(
|
||||
List<Map<String, Object>> 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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user