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

Update service data pegawai

Browse Source 
Penambahan filter, validasi, dan loggin untuk kategori peserta didik fellowship
This commit is contained in:
Salman Manoe 2025-01-22 15:12:17 +07:00
parent 911099c3a8
commit 4c5561052a
5 changed files with 33 additions and 29 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 };
}

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

@ -400,10 +400,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, "

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, ";
}
}

16
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<>();
@ -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);

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

@ -180,6 +180,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
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());
@ -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, ";
}
}