salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/pegawai/peserta-didik' into prod/base

Browse Source
This commit is contained in:
Salman Manoe 2025-02-03 09:49:18 +07:00
commit a4aa2ad173
10 changed files with 84 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -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 };
}

19
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
View File

@ -374,12 +374,13 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, 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 "
@ -400,10 +401,10 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, 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<Map<String, Object>> findAllPegawaiByKategory(@Param("listKedudukan") List<Integer> listKedudukan,
@Param("idKategoryPegawai") Integer idKategoryPegawai);
@Param("listIdKategoryPegawai") List<Integer> listIdKategoryPegawai);
@Query("select new map (jabatanInternal.namaJabatan as jabatanInternal, "
+ "jabatanInternal.id as idJabatanInternal, " + "unitKerja.id as idUnitKerja, "
@ -892,7 +893,7 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, 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, "

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java
View File

@ -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<Pegawai> {
List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException);
List<Map<String, Object>> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan,
String periode, List<Integer> listKedudukanException, Integer idKategori);
List<Map<String, Object>> findPegawaiByNamePesertaDidik(String namaPegawai);
String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori);
List<Map<String, Object>> findAllPegawaiByJenisPegawaiPengajar();

48
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
View File

@ -114,34 +114,6 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
return list;
}
@Override
public List<Map<String, Object>> 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<Map<String, Object>> list = query.getResultList();
return list;
}
@Override
public List<Map<String, Object>> findAllPegawaiByJenisPegawaiPengajar() {
StringBuffer buffer = new StringBuffer();
@ -452,7 +424,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
@Override
public List<Map<String, Object>> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan,
String periode, List<Integer> listKedudukanException, Integer idKategori) {
String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori) {
StringBuffer buffer = new StringBuffer();
buffer.append("select new map (pegawai.id as idPegawai," + "pegawai.nama as nama,"
@ -487,13 +459,13 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> 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 "
@ -516,7 +488,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> 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<Pegawai> implements Pegawa
Query query = em.createQuery(buffer.toString());
query.setParameter("idKategori", idKategori);
query.setParameter("listIdKategori", listIdKategori);
if (CommonUtil.isNotNullOrEmpty(idUnitKerja)) {
List<Integer> listPegawaiByUnitKerja = pegawaiDao.getPegawaiByIdUnitKerja(idUnitKerja);

22
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
View File

@ -88,6 +88,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
public Map<String, Object> save(List<MapPegawaiJabatanToUnitKerjaVO> listVo) {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> listResult = new ArrayList<>();
List<Integer> 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<Integer> listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik");
for (MapPegawaiJabatanToUnitKerjaVO vo : listVo) {
MapPegawaiJabatanToUnitKerja map = new MapPegawaiJabatanToUnitKerja();
Map<String, Object> 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, ";
}
}

22
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
View File

@ -521,8 +521,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
public Map<String, Object> findAllPegawaiPNS() {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDao
.findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PNS);
List<Map<String, Object>> resultModel = pegawaiDao.findAllPegawaiByKategory(
Arrays.asList(Master.KedudukanPegawai.NONSDM), Collections.singletonList(Master.KategoryPegawai.PNS));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -572,8 +572,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
public Map<String, Object> findAllPegawaiMitra() {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDao
.findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.MITRA);
List<Map<String, Object>> resultModel = pegawaiDao.findAllPegawaiByKategory(
Arrays.asList(Master.KedudukanPegawai.NONSDM), Collections.singletonList(Master.KategoryPegawai.MITRA));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -624,7 +624,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDao.findAllPegawaiByKategory(
Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PESERTA_DIDIK);
Arrays.asList(Master.KedudukanPegawai.NONSDM), splitDataSettingDatafixed("listIdKategoriPesertaDidik"));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -675,7 +675,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> 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<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -780,7 +781,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
Master.KategoryPegawai.MITRA);
Collections.singletonList(Master.KategoryPegawai.MITRA));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -833,7 +834,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
Master.KategoryPegawai.DOKTER_TAMU);
Collections.singletonList(Master.KategoryPegawai.DOKTER_TAMU));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -886,7 +887,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
Master.KategoryPegawai.PESERTA_DIDIK);
splitDataSettingDatafixed("listIdKategoriPesertaDidik"));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -2261,7 +2262,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
Map<String, Object> 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);

39
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java
View File

@ -178,7 +178,9 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
List<Integer> kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed("kategoriPegawaiAksesAplikasiRemun");
List<Integer> kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed(
"kategoriPegawaiAksesAplikasiRemun");
List<Integer> listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik");
if (CommonUtil.isNotNullOrEmpty(vo.getId())) {
pegawai = rekamDataPegawaiDao.findOne(vo.getId());
Integer idJabatanUtama = mapPegawaiJabatanToUnitkerjaDao.getIdJabatanInternalUtamaByIdPegawai(vo.getId());
@ -1253,6 +1255,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 +1541,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)) {
@ -1636,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, ";
@ -1645,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, ";
@ -1761,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, ";
@ -1771,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, ";
@ -1779,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, ";
@ -1956,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, ";
@ -1984,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, ";
}
}

4
jasamedika-config/src/main/resources/jdbc.development.properties
View File

@ -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

3
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java
View File

@ -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;
}

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java
View File

@ -278,4 +278,6 @@ public class RekamDataPegawaiVO extends BaseTransactionVO {
private Boolean isMenanggung;
private List<MapPegawaiJabatanToUnitKerjaVO> mappingJabatan;
private String nim;
}