From 696ce63a488235bbf7ce9c52f1cade274c19c260 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 15 Jan 2025 09:54:47 +0700 Subject: [PATCH 1/3] Update service rekam data pegawai peserta didik Penyesuaian entri NIM dan validasi kategori peserta didik baru --- .../dao/custom/PegawaiDaoCustom.java | 10 +++--- .../dao/custom/impl/PegawaiDaoCustomImpl.java | 34 ++----------------- .../service/impl/PegawaiServiceImpl.java | 6 ++-- .../impl/RekamDataPegawaiServiceImpl.java | 20 ++++++++++- .../resources/jdbc.development.properties | 4 +-- .../medifirst2000/entities/Pegawai.java | 3 ++ .../medifirst2000/vo/RekamDataPegawaiVO.java | 2 ++ 7 files changed, 36 insertions(+), 43 deletions(-) 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..a6bf653f 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 listIdKategori); 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..b86da6b0 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 @@ -780,7 +780,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), - Master.KategoryPegawai.MITRA); + Collections.singletonList(Master.KategoryPegawai.MITRA)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -833,7 +833,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 +886,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); + splitDataSettingDatafixed("listIdKategoriPesertaDidik")); for (Map map : resultModel) { Map usernames = new HashMap<>(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 4b474efa..19ad001f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -178,7 +178,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - List kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed("kategoriPegawaiAksesAplikasiRemun"); + List kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed( + "kategoriPegawaiAksesAplikasiRemun"); if (CommonUtil.isNotNullOrEmpty(vo.getId())) { pegawai = rekamDataPegawaiDao.findOne(vo.getId()); Integer idJabatanUtama = mapPegawaiJabatanToUnitkerjaDao.getIdJabatanInternalUtamaByIdPegawai(vo.getId()); @@ -1253,6 +1254,19 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setRekanan(null); perubahan += "hapus perusahaan mitra, "; } + + if (CommonUtil.isNotNullOrEmpty(pegawai.getNim()) && CommonUtil.isNotNullOrEmpty(vo.getNim())) { + if (!pegawai.getNim().equals(vo.getNim())) { + pegawai.setNim(vo.getNim()); + perubahan += "ubah nim, "; + } + } else if (CommonUtil.isNullOrEmpty(pegawai.getNim()) && CommonUtil.isNotNullOrEmpty(vo.getNim())) { + pegawai.setNim(vo.getNim()); + perubahan += "nim, "; + } else if (CommonUtil.isNotNullOrEmpty(pegawai.getNim()) && CommonUtil.isNullOrEmpty(vo.getNim())) { + pegawai.setNim(vo.getNim()); + perubahan += "hapus nim, "; + } } else { pegawai.setKdProfile(Master.KODE_PROFILE); pegawai.setStatusEnabled(Master.STATUS_ENABLE_TRUE); @@ -1526,6 +1540,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setRekanan(rekananConverter.transferVOToModel(vo.getRekanan(), new Rekanan())); perubahan += "perusahaan mitra, "; } + if (CommonUtil.isNotNullOrEmpty(vo.getNim())) { + pegawai.setNim(vo.getNim()); + perubahan += "nim, "; + } } if (CommonUtil.isNullOrEmpty(perubahan)) { diff --git a/jasamedika-config/src/main/resources/jdbc.development.properties b/jasamedika-config/src/main/resources/jdbc.development.properties index 5db229ff..57bb2f0b 100644 --- a/jasamedika-config/src/main/resources/jdbc.development.properties +++ b/jasamedika-config/src/main/resources/jdbc.development.properties @@ -8,11 +8,11 @@ hibernate.show_sql = true hikari.config.maximum.pool.size = 5 # DB Development -jdbc.url = jdbc:postgresql://192.168.12.3:5432/rsab_hk_24_08_20 +jdbc.url = jdbc:postgresql://192.168.12.3:5432/rsab_hk_25_01_14 jdbc.username = smart_user jdbc.password = 1miwhir3yr jdbc.serverName = 192.168.12.3 -jdbc.databaseName = rsab_hk_24_08_20 +jdbc.databaseName = rsab_hk_25_01_14 jdbc.portNumber = 5432 corePoolSizeAsyncConfigurer = 5 diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java index 57ee181d..15b3bf41 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java @@ -611,4 +611,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectPegawaiPembimbingFk", insertable = false, updatable = false) private Integer pegawaiPembimbingId; + + @Column(name = "nim", length = 32) + private String nim; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java index 2e8f1a44..783b2aa5 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java @@ -278,4 +278,6 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { private Boolean isMenanggung; private List mappingJabatan; + + private String nim; } From 4c5561052a86bd927dd2e9fb8943bb2487bf71ab Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 22 Jan 2025 15:12:17 +0700 Subject: [PATCH 2/3] Update service data pegawai Penambahan filter, validasi, dan loggin untuk kategori peserta didik fellowship --- .../medifirst2000/constants/Master.java | 1 - .../medifirst2000/dao/PegawaiDao.java | 4 ++-- ...pPegawaiJabatanToUnitKerjaServiceImpl.java | 22 ++++++++++--------- .../service/impl/PegawaiServiceImpl.java | 16 ++++++++------ .../impl/RekamDataPegawaiServiceImpl.java | 19 ++++++++-------- 5 files changed, 33 insertions(+), 29 deletions(-) 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..1a4ca7bf 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 @@ -148,7 +148,6 @@ public final class Master { public static final Integer MITRA = 16; public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,_mitra public static final Integer[] PARUH_WAKTU = { 12, 19 }; - public static final Integer PESERTA_DIDIK = 17; public static final Integer PNS = 1; public static final Integer[] REMUN = { 1, 10, 14, 21 }; } 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 142ce3c7..57de4c58 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 @@ -400,10 +400,10 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join pegawai.statusKawin statusKawin " + "left join pegawai.statusPegawai statusPegawai " + "left join pegawai.statusPerkawinanPegawai statusPerkawinanPegawai " + "left join pegawai.suku suku " + "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true " - + "and pegawai.kategoryPegawaiId = :idKategoryPegawai " + // PNS + + "and pegawai.kategoryPegawaiId in (:listIdKategoryPegawai) " + // PNS "and kedudukan.id not in :listKedudukan " + "order by pegawai.nama") List> findAllPegawaiByKategory(@Param("listKedudukan") List listKedudukan, - @Param("idKategoryPegawai") Integer idKategoryPegawai); + @Param("listIdKategoryPegawai") List listIdKategoryPegawai); @Query("select new map (jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal, " + "unitKerja.id as idUnitKerja, " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java index b65afc29..8f369b9f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java @@ -88,6 +88,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl public Map save(List listVo) { Map result = new HashMap<>(); List> listResult = new ArrayList<>(); + List listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik"); if (CommonUtil.isNotNullOrEmpty(listVo)) { for (MapPegawaiJabatanToUnitKerjaVO vo : listVo) { @@ -112,7 +113,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } if (CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "hapus mapping dokter penanggung jawab, "; } else { perubahan += "hapus mapping jabatan, "; @@ -316,6 +317,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl String perubahan = ""; + List listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik"); for (MapPegawaiJabatanToUnitKerjaVO vo : listVo) { MapPegawaiJabatanToUnitKerja map = new MapPegawaiJabatanToUnitKerja(); Map tmp = new HashMap<>(); @@ -361,7 +363,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { if (!map.getStatusEnabled().equals(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -370,7 +372,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } else if (CommonUtil.isNullOrEmpty(map.getStatusEnabled()) && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -499,7 +501,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl if (!map.getAtasanLangsungId().equals(vo.getAtasanLangsung().getId())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "ubah dokter penanggung jawab, "; } else { perubahan += "ubah atasan langsung, "; @@ -508,7 +510,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } else if (CommonUtil.isNullOrEmpty(map.getAtasanLangsungId()) && CommonUtil.isNotNullOrEmpty(vo.getAtasanLangsung())) { map.setAtasanLangsung(pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -516,7 +518,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } else if (CommonUtil.isNotNullOrEmpty(map.getAtasanLangsungId()) && CommonUtil.isNullOrEmpty(vo.getAtasanLangsung())) { map.setAtasanLangsung(null); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "hapus dokter penanggung jawab, "; } else { perubahan += "hapus atasan langsung, "; @@ -673,7 +675,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl if (CommonUtil.isNotNullOrEmpty(vo.getAtasanLangsung())) { map.setAtasanLangsung(pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -700,21 +702,21 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl if (vo.getIsPrimary()) { disableIsprimary(vo.getPegawai().getId()); } - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status jabatan utama, "; } } if (CommonUtil.isNotNullOrEmpty(vo.getIsMonitoring())) { map.setIsMonitoring(vo.getIsMonitoring()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status monitoring, "; } } if (CommonUtil.isNotNullOrEmpty(vo.getIsCanCreateJadwal())) { map.setIsCanCreateJadwal(vo.getIsCanCreateJadwal()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status buat jadwal dinas, "; } } 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 b86da6b0..5303dcb8 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 @@ -521,8 +521,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ public Map findAllPegawaiPNS() { Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); - List> resultModel = pegawaiDao - .findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PNS); + List> resultModel = pegawaiDao.findAllPegawaiByKategory( + Arrays.asList(Master.KedudukanPegawai.NONSDM), Collections.singletonList(Master.KategoryPegawai.PNS)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -572,8 +572,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ public Map findAllPegawaiMitra() { Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); - List> resultModel = pegawaiDao - .findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.MITRA); + List> resultModel = pegawaiDao.findAllPegawaiByKategory( + Arrays.asList(Master.KedudukanPegawai.NONSDM), Collections.singletonList(Master.KategoryPegawai.MITRA)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -624,7 +624,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiByKategory( - Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PESERTA_DIDIK); + Arrays.asList(Master.KedudukanPegawai.NONSDM), splitDataSettingDatafixed("listIdKategoriPesertaDidik")); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -675,7 +675,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiByKategory( - Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.DOKTER_TAMU); + Arrays.asList(Master.KedudukanPegawai.NONSDM), + Collections.singletonList(Master.KategoryPegawai.DOKTER_TAMU)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -2261,7 +2262,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Map map = pegawaiDao.getPegawaiKeluarHariIni(today, idPegawai); if (CommonUtil.isNotNullOrEmpty(map)) { - if (map.get("idKategoryPegawai").equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (splitDataSettingDatafixed("listIdKategoriPesertaDidik") + .contains(Integer.parseInt(map.get("idKategoryPegawai").toString()))) { Pegawai pegawai = pegawaiDao.findOne(Integer.parseInt(map.get("idPegawai").toString())); Kedudukan kedudukan = new Kedudukan(); kedudukan.setId(Master.KedudukanPegawai.NONAKTIF); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 19ad001f..097b74ee 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -180,6 +180,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re List kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed( "kategoriPegawaiAksesAplikasiRemun"); + List listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik"); if (CommonUtil.isNotNullOrEmpty(vo.getId())) { pegawai = rekamDataPegawaiDao.findOne(vo.getId()); Integer idJabatanUtama = mapPegawaiJabatanToUnitkerjaDao.getIdJabatanInternalUtamaByIdPegawai(vo.getId()); @@ -1654,7 +1655,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { if (!map.getStatusEnabled().equals(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -1663,7 +1664,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } else if (CommonUtil.isNullOrEmpty(map.getStatusEnabled()) && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -1779,7 +1780,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (!map.getAtasanLangsungId().equals(mapVo.getAtasanLangsung().getId())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(mapVo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "ubah dokter penanggung jawab, "; } else { perubahan += "ubah atasan langsung, "; @@ -1789,7 +1790,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re && CommonUtil.isNotNullOrEmpty(mapVo.getAtasanLangsung())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(mapVo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -1797,7 +1798,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } else if (CommonUtil.isNotNullOrEmpty(map.getAtasanLangsungId()) && CommonUtil.isNullOrEmpty(mapVo.getAtasanLangsung())) { map.setAtasanLangsung(null); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "hapus dokter penanggung jawab, "; } else { perubahan += "hapus atasan langsung, "; @@ -1974,7 +1975,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(mapVo.getAtasanLangsung())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(mapVo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -2002,21 +2003,21 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (mapVo.getIsPrimary()) { disableIsprimary(resultDomain.getId()); } - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status jabatan utama, "; } } if (CommonUtil.isNotNullOrEmpty(mapVo.getIsMonitoring())) { map.setIsMonitoring(mapVo.getIsMonitoring()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status monitoring, "; } } if (CommonUtil.isNotNullOrEmpty(mapVo.getIsCanCreateJadwal())) { map.setIsCanCreateJadwal(mapVo.getIsCanCreateJadwal()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status buat jadwal dinas, "; } } From ca39233303ab707fae158b20957cf94ab1af265d Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 23 Jan 2025 13:35:30 +0700 Subject: [PATCH 3/3] Update dao pegawai Penambahan informasi nim peserta didik --- .../jasamedika/medifirst2000/dao/PegawaiDao.java | 15 ++++++++------- .../dao/custom/impl/PegawaiDaoCustomImpl.java | 14 +++++++------- 2 files changed, 15 insertions(+), 14 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 57de4c58..6ee3ef62 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 @@ -374,12 +374,13 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.totalNilaiScore as totalNilaiScore," + "pegawai.tunjanganFungsional as tunjanganFungsional," + "pegawai.tunjanganPapua as tunjanganPapua," + "pegawai.tunjanganUmum as tunjanganUmum," + "pegawai.noIdentitas as noIdentitas," + "pegawai.nipPns as nipPns," + "pegawai.nip as nip," - + "pegawai.nikIntern as nikIntern," + "pegawai.tanggalMeninggal as tanggalMeninggal," - + "pegawai.pensiun as usiaPensiun," + "pegawai.tglPensiun as tglPensiun," + "pegawai.idFinger as idFinger," - + "ruangan.id as idRuangan," + "ruangan.namaRuangan as namaRuangan," + "rekanan.id as idRuangan," - + "rekanan.namaRekanan as namaRekanan," + "satuanKerja.satuanKerja as satuanKerja," - + "shiftKerja.name as shiftKerja," + "shiftKerja.id as idKelompokShiftKerja," - + "statusKawin.statusPerkawinan as statusKawin," + "statusPegawai.statusPegawai as statusPegawai," + + "pegawai.nikIntern as nikIntern," + "pegawai.nim as nim," + + "pegawai.tanggalMeninggal as tanggalMeninggal," + "pegawai.pensiun as usiaPensiun," + + "pegawai.tglPensiun as tglPensiun," + "pegawai.idFinger as idFinger," + "ruangan.id as idRuangan," + + "ruangan.namaRuangan as namaRuangan," + "rekanan.id as idRuangan," + "rekanan.namaRekanan as namaRekanan," + + "satuanKerja.satuanKerja as satuanKerja," + "shiftKerja.name as shiftKerja," + + "shiftKerja.id as idKelompokShiftKerja," + "statusKawin.statusPerkawinan as statusKawin," + + "statusPegawai.statusPegawai as statusPegawai," + "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai," + "suku.suku as suku," + "typePegawai.typePegawai as typePegawai," + "pegawai.statusEnabled as statusEnabled)" + "from Pegawai pegawai " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " @@ -892,7 +893,7 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.kategoryPegawaiId as kategoryPegawaiId, " + "pegawai.kedudukanId as kedudukanId, " + "pegawai.kualifikasiJurusanId as kualifikasiJurusanId, " + "pegawai.nama as nama, " + "pegawai.namaLengkap as namaLengkap, " + "pegawai.nikIntern as nikIntern, " + "pegawai.nip as nip, " - + "pegawai.nipPns as nipPns, " + "pegawai.noHandphone as noHandphone, " + + "pegawai.nipPns as nipPns, " + "pegawai.nim as nim, " + "pegawai.noHandphone as noHandphone, " + "pegawai.noIdentitas as noIdentitas, " + "pegawai.noSip as noSip, " + "pegawai.noStr as noStr, " + "pegawai.noTlp as noTlp, " + "pegawai.negaraId as negaraId, " + "pegawai.pegawaiPembimbingId as pegawaiPembimbingId, " + "pegawai.pendidikanId as pendidikanId, " 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 84e99822..b03a8bc2 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 @@ -459,13 +459,13 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "pegawai.totalNilaiScore as totalNilaiScore," + "pegawai.tunjanganFungsional as tunjanganFungsional," + "pegawai.tunjanganPapua as tunjanganPapua," + "pegawai.tunjanganUmum as tunjanganUmum," + "pegawai.noIdentitas as noIdentitas," + "pegawai.nipPns as nipPns," + "pegawai.nip as nip," - + "pegawai.nikIntern as nikIntern," + "pegawai.tanggalMeninggal as tanggalMeninggal," - + "pegawai.pensiun as usiaPensiun," + "pegawai.tglPensiun as tglPensiun," - + "pegawai.idFinger as idFinger," + "ruangan.id as idRuangan," + "ruangan.namaRuangan as namaRuangan," - + "rekanan.id as idRuangan," + "rekanan.namaRekanan as namaRekanan," - + "satuanKerja.satuanKerja as satuanKerja," + "shiftKerja.name as shiftKerja," - + "shiftKerja.id as idKelompokShiftKerja," + "statusPegawai.statusPegawai as statusPegawai," - + "statusKawin.statusPerkawinan as statusKawin," + + "pegawai.nikIntern as nikIntern," + "pegawai.nim as nim," + + "pegawai.tanggalMeninggal as tanggalMeninggal," + "pegawai.pensiun as usiaPensiun," + + "pegawai.tglPensiun as tglPensiun," + "pegawai.idFinger as idFinger," + "ruangan.id as idRuangan," + + "ruangan.namaRuangan as namaRuangan," + "rekanan.id as idRuangan," + + "rekanan.namaRekanan as namaRekanan," + "satuanKerja.satuanKerja as satuanKerja," + + "shiftKerja.name as shiftKerja," + "shiftKerja.id as idKelompokShiftKerja," + + "statusPegawai.statusPegawai as statusPegawai," + "statusKawin.statusPerkawinan as statusKawin," + "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai," + "suku.suku as suku," + "typePegawai.typePegawai as typePegawai," + "pegawai.statusEnabled as statusEnabled)" + "from Pegawai pegawai " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai "