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

Merge branch 'dev/pegawai/jadwal-kerja' into prod/base

Browse Source
This commit is contained in:
Salman Manoe 2024-11-20 14:49:48 +07:00
commit f03a842dd2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,7 +1068,8 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
Integer.parseInt(map.get("subLevelJabatan").toString()),
Arrays.asList(Master.Pegawai.RESTRICTED_EMPLOYEE),
Arrays.asList(Master.KategoryPegawai.NONSDM)));
} else if (Arrays.asList(Master.Jabatan.LEVEL_KEPALA).contains(map.get("levelJabatan"))) {
} else if (Arrays.asList(Master.Jabatan.LEVEL_KEPALA)
.contains(Integer.parseInt(map.get("levelJabatan").toString()))) {
listMapp.addAll(mapPegawaiJabatanToUnitKerjaDao.findMappByLevelJabatan(
Integer.parseInt(map.get("idUnit").toString()), idPegawai,
Arrays.asList(Master.Pegawai.RESTRICTED_EMPLOYEE),
@ -1255,12 +1256,13 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
Map<String, Object> tmp = new HashMap<>();
boolean valid = false;
for (Map<String, Object> map : lis) {
if (map.get("id").equals(pgw.getUnitKerja().getUnitKerja().getId())) {
if (CommonUtil.isNotNullOrEmpty(pgw.getUnitKerja())
&& map.get("id").equals(pgw.getUnitKerja().getUnitKerja().getId())) {
valid = true;
break;
}
}
if (!valid) {
if (!valid && CommonUtil.isNotNullOrEmpty(pgw.getUnitKerja())) {
tmp.put("id", pgw.getUnitKerja().getUnitKerja().getId());
tmp.put("name", pgw.getUnitKerja().getUnitKerja().getName());
lis.add(tmp);
@ -1472,8 +1474,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
if (mapPegawaiJabatanToUnitKerjaDao.existsByPegawaiIdAndJabatanIdIn(idPegawaiLogin,
listIdJabatanKetuaKomiteNakesLain)) {
List<Map<String, Object>> listSubUnitKerjaNakesLain = mapPegawaiJabatanToUnitKerjaDao
.getMapSubunitKerjaMonitoringByKelompokJabatan(idUnitKerja,
PENUNJANG_MEDIK);
.getMapSubunitKerjaMonitoringByKelompokJabatan(idUnitKerja, PENUNJANG_MEDIK);
List<Integer> alreadyAdded = result.stream().map(rs -> Integer.parseInt(rs.get("id").toString()))
.collect(Collectors.toList());
result.addAll(listSubUnitKerjaNakesLain.stream()
@ -1492,8 +1493,8 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
List<Map<String, Object>> listMap = mapPegawaiJabatanToUnitKerjaDao.getAtasanLangsungByPegawai(idPegawai);
for (Map<String, Object> map : listMap) {
Map<String, Object> mapFilter = new HashMap<>();
if (map.get("idUnitKerja").equals(Master.UnitKerja.DIREKSI)
&& Arrays.asList(Master.Jabatan.DIRUT).contains(map.get("idJabatan"))) {
if (map.get("idUnitKerja").equals(Master.UnitKerja.DIREKSI) && Arrays.asList(Master.Jabatan.DIRUT)
.contains(Integer.parseInt(map.get("idJabatan").toString()))) {
mapFilter.put("id", --i);
mapFilter.put("namaLengkap", map.get("atasanLangsung"));
} else {