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

Merge branch 'dev/kepegawaian/golongan-pppk' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-02-25 08:30:22 +07:00
commit 54ad57638d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1821,6 +1821,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(jabatanFungsional)) { if (CommonUtil.isNotNullOrEmpty(jabatanFungsional)) {
result.put("jabatanFungsional", jabatanFungsional); result.put("jabatanFungsional", jabatanFungsional);
} }
result.remove("jabatanFungsionalId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("jabatanInternalId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("jabatanInternalId"))) {
Map<String, Object> jabatanInternal = jabatanDao Map<String, Object> jabatanInternal = jabatanDao
@ -1828,6 +1829,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(jabatanInternal)) { if (CommonUtil.isNotNullOrEmpty(jabatanInternal)) {
result.put("jabatanInternal", jabatanInternal); result.put("jabatanInternal", jabatanInternal);
} }
result.remove("jabatanInternalId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("jabatanLamarId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("jabatanLamarId"))) {
Map<String, Object> jabatanLamar = jabatanDao Map<String, Object> jabatanLamar = jabatanDao
@ -1835,6 +1837,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(jabatanLamar)) { if (CommonUtil.isNotNullOrEmpty(jabatanLamar)) {
result.put("jabatanLamar", jabatanLamar); result.put("jabatanLamar", jabatanLamar);
} }
result.remove("jabatanLamarId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("jabatanStrukturalId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("jabatanStrukturalId"))) {
Map<String, Object> jabatanStruktural = jabatanDao Map<String, Object> jabatanStruktural = jabatanDao
@ -1842,6 +1845,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(jabatanStruktural)) { if (CommonUtil.isNotNullOrEmpty(jabatanStruktural)) {
result.put("jabatanStruktural", jabatanStruktural); result.put("jabatanStruktural", jabatanStruktural);
} }
result.remove("jabatanStrukturalId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("jenisKelaminId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("jenisKelaminId"))) {
Map<String, Object> jenisKelamin = jenisKelaminDao Map<String, Object> jenisKelamin = jenisKelaminDao
@ -1900,7 +1904,10 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
} }
if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) {
Optional<GolonganPPPK> byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString()); Optional<GolonganPPPK> byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString());
byId.ifPresent(golonganPPPK -> result.put("golonganPPPK", golonganPPPK)); byId.ifPresent(golonganPPPK -> {
result.put("golonganPPPK", golonganPPPK);
result.remove("golonganPPPKId");
});
} }
if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) {
Map<String, Object> rekanan = rekananDao Map<String, Object> rekanan = rekananDao
@ -1908,6 +1915,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(rekanan)) { if (CommonUtil.isNotNullOrEmpty(rekanan)) {
result.put("rekanan", rekanan); result.put("rekanan", rekanan);
} }
result.remove("rekananId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("ruanganId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("ruanganId"))) {
Map<String, Object> ruangan = ruanganDao Map<String, Object> ruangan = ruanganDao
@ -1915,6 +1923,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(ruangan)) { if (CommonUtil.isNotNullOrEmpty(ruangan)) {
result.put("ruangan", ruangan); result.put("ruangan", ruangan);
} }
result.remove("ruanganId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("shiftKerjaId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("shiftKerjaId"))) {
Map<String, Object> shiftKerja = kelompokShiftDao Map<String, Object> shiftKerja = kelompokShiftDao
@ -1945,6 +1954,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
if (CommonUtil.isNotNullOrEmpty(typePegawai)) { if (CommonUtil.isNotNullOrEmpty(typePegawai)) {
result.put("typePegawai", typePegawai); result.put("typePegawai", typePegawai);
} }
result.remove("typePegawaiId");
} }
return result; return result;