diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 9f661fd5..66fc0df1 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -146,7 +146,7 @@ public final class Master { public static final Integer[] DOKTER_LUAR = { 12, 13, 19 }; public static final Integer DOKTER_TAMU = 19; public static final Integer MITRA = 16; - public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,_mitra + public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,mitra_bank public static final Integer[] PARUH_WAKTU = { 12, 19 }; public static final Integer PESERTA_DIDIK = 17; public static final Integer PNS = 1; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java index 13d1d732..f99743a6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java @@ -1,12 +1,12 @@ package com.jasamedika.medifirst2000.dao.custom; -import java.util.List; -import java.util.Map; - import com.jasamedika.medifirst2000.dao.custom.base.CoreDao; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.PegawaiJadwalKerja; +import java.util.List; +import java.util.Map; + /** * * @author Roberto @@ -25,9 +25,7 @@ public interface PegawaiDaoCustom extends CoreDao { List listStatusPegawaiId, String periode, List listKedudukanException); List> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan, - String periode, List listKedudukanException, Integer idKategori); - - List> findPegawaiByNamePesertaDidik(String namaPegawai); + String periode, List listKedudukanException, List idKategori); List> findAllPegawaiByJenisPegawaiPengajar(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java index ac1813d8..84e99822 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java @@ -114,34 +114,6 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa return list; } - @Override - public List> findPegawaiByNamePesertaDidik(String namaPegawai) { - StringBuffer buffer = new StringBuffer(); - buffer.append(" select "); - buffer.append(" new map"); - buffer.append(" ( "); - buffer.append(" p.nipPns , p.namaLengkap ,p.tglLahir , " + "p.tempatLahir , p.noHandphone," + "p.alamat , " - + "jabatanInternal.kdJabatan,jabatanInternal.namaJabatan, " + "golongan.id,golongan.golonganPegawai, " - + " statusKawin.statusPerkawinan, statusKawin.id, " + "agama.agama, agama.kdAgama, " - + " satuanKerja.kdSatuanKerja,satuanKerja.satuanKerja , " - + " jabatanStruktural.kdJabatan ,jabatanStruktural.namaJabatan, " - + " jenisKelamin.jenisKelamin,jenisKelamin.id," - + " jabatanFungsional.kdJabatan ,jabatanFungsional.namaJabatan"); - buffer.append(" ) "); - buffer.append("from Pegawai p " + " left join p.jabatanInternal jabatanInternal" - + " left join p.golonganPegawai golongan " + " left join p.statusKawin statusKawin " - + " left join p.agama agama " + " left join p.satuanKerja satuanKerja " - + " left join p.jabatanStruktural jabatanStruktural " - + " left join p.jabatanFungsional jabatanFungsional " + " left join p.jenisKelamin jenisKelamin " - + " where lower (p.namaLengkap) like lower ('%" + namaPegawai + "%') " + " order by p.namaLengkap "); - - Query query = em.createQuery(buffer.toString()); - - List> list = query.getResultList(); - - return list; - } - @Override public List> findAllPegawaiByJenisPegawaiPengajar() { StringBuffer buffer = new StringBuffer(); @@ -452,7 +424,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa @Override public List> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan, - String periode, List listKedudukanException, Integer idKategori) { + String periode, List listKedudukanException, List listIdKategori) { StringBuffer buffer = new StringBuffer(); buffer.append("select new map (pegawai.id as idPegawai," + "pegawai.nama as nama," @@ -516,7 +488,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "left join pegawai.statusPegawai statusPegawai " + "left join pegawai.statusKawin statusKawin " + "left join pegawai.statusPerkawinanPegawai statusPerkawinanPegawai " + "left join pegawai.suku suku " + "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true " - + "and kategoriPegawai.id = :idKategori "); + + "and kategoriPegawai.id in (:listIdKategori) "); if (CommonUtil.isNotNullOrEmpty(nama)) { buffer.append("and lower(pegawai.nama) like lower ('%" + nama + "%') "); @@ -538,7 +510,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa Query query = em.createQuery(buffer.toString()); - query.setParameter("idKategori", idKategori); + query.setParameter("listIdKategori", listIdKategori); if (CommonUtil.isNotNullOrEmpty(idUnitKerja)) { List listPegawaiByUnitKerja = pegawaiDao.getPegawaiByIdUnitKerja(idUnitKerja); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index c01b72b8..83464cb2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -726,6 +726,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ List listStatusPegawaiId, String periode) { Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); + if (CommonUtil.isNullOrEmpty(listStatusPegawaiId)) + listStatusPegawaiId = splitDataSettingDatafixed("listIdKategoryPegawaiNonSdm"); List> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan, listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException")); @@ -778,9 +780,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ String periode) { Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); + List listMitra = splitDataSettingDatafixed("listIdKategoryPegawaiMitra"); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, - idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), - Master.KategoryPegawai.MITRA); + idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), listMitra); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -833,7 +835,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), - Master.KategoryPegawai.DOKTER_TAMU); + Collections.singletonList(Master.KategoryPegawai.DOKTER_TAMU)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -886,7 +888,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), - Master.KategoryPegawai.PESERTA_DIDIK); + Collections.singletonList(Master.KategoryPegawai.PESERTA_DIDIK)); for (Map map : resultModel) { Map usernames = new HashMap<>();