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

Merge branch 'ade/bug-fixing/level-unitkerja-direktur' into prod/base

Browse Source
This commit is contained in:
adesyawal 2025-10-27 14:32:31 +07:00
commit fbec23b80f
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java
View File

@ -371,7 +371,7 @@ public interface MonitoringAbsenDao extends PagingAndSortingRepository<Monitorin
+ "left join mp.jabatan jb with jb.statusEnabled is true " + "left join mp.jabatan jb with jb.statusEnabled is true "
+ "where mp.statusEnabled is true and pg.statusEnabled is true " + "where mp.statusEnabled is true and pg.statusEnabled is true "
+ "and pg.kedudukanId not in (:listException) " + "and mp.unitKerjaPegawaiId = :idUnitKerja " + "and pg.kedudukanId not in (:listException) " + "and mp.unitKerjaPegawaiId = :idUnitKerja "
+ "and jb.levelJabatan = :levelJabatan+1 " // satu_level_dibawah_pegawai_login + "and (jb.levelJabatan = :levelJabatan+1 or jb.levelJabatan = :levelJabatan+2) " // dua_level_dibawah_pegawai_login
+ "and jb.subLevelJabatan = :sublevelJabatan") + "and jb.subLevelJabatan = :sublevelJabatan")
List<Map<String, Object>> getDataPegawaiDirektur(@Param("idUnitKerja") Integer idUnitKerja, List<Map<String, Object>> getDataPegawaiDirektur(@Param("idUnitKerja") Integer idUnitKerja,
@Param("levelJabatan") Integer levelJabatan, @Param("sublevelJabatan") Integer sublevelJabatan, @Param("levelJabatan") Integer levelJabatan, @Param("sublevelJabatan") Integer sublevelJabatan,

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

@ -1278,29 +1278,25 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
int sublevelJabatan = 0; int sublevelJabatan = 0;
List<Integer> listIdJabatanKetuaKomiteNakesLain = splitDataSettingDatafixed("idJabatanKetuaKomiteNakesLain"); List<Integer> listIdJabatanKetuaKomiteNakesLain = splitDataSettingDatafixed("idJabatanKetuaKomiteNakesLain");
List<Map<String, Object>> mapLevel = mapPegawaiJabatanToUnitKerjaDao.getMappLevelByPegawai(idPegawai); List<Map<String, Object>> mapLevel = mapPegawaiJabatanToUnitKerjaDao.getMappLevelByPegawai(idPegawai);
for (Map<String, Object> map : mapLevel) List<Map<String, Object>> result = mapPegawaiJabatanToUnitKerjaDao.getMapUnitKerjaByPegawai(idPegawai);
for (Map<String, Object> map : mapLevel){
if (map.get("levelJabatan").equals(Master.Jabatan.LEVEL_DIREKTUR)) { if (map.get("levelJabatan").equals(Master.Jabatan.LEVEL_DIREKTUR)) {
isDirektur = true; isDirektur = true;
levelJabatan = Integer.parseInt(map.get("levelJabatan").toString()); levelJabatan = Integer.parseInt(map.get("levelJabatan").toString());
sublevelJabatan = Integer.parseInt(map.get("subLevelJabatan").toString()); sublevelJabatan = Integer.parseInt(map.get("subLevelJabatan").toString());
break;
}
List<Map<String, Object>> result = mapPegawaiJabatanToUnitKerjaDao.getMapUnitKerjaByPegawai(idPegawai);
if (isDirektur)
result.addAll(mapPegawaiJabatanToUnitKerjaDao.getMapUnitKerjaByLevelJabatan(levelJabatan, sublevelJabatan)); result.addAll(mapPegawaiJabatanToUnitKerjaDao.getMapUnitKerjaByLevelJabatan(levelJabatan, sublevelJabatan));
if (mapPegawaiJabatanToUnitKerjaDao.existsByPegawaiIdAndJabatanIdIn(idPegawai, }
listIdJabatanKetuaKomiteNakesLain)) { }
List<Map<String, Object>> listUnitKerja = mapPegawaiJabatanToUnitKerjaDao
.getMapUnitKerjaByKelompokJabatan(PENUNJANG_MEDIK); if (mapPegawaiJabatanToUnitKerjaDao.existsByPegawaiIdAndJabatanIdIn(idPegawai, listIdJabatanKetuaKomiteNakesLain)) {
List<Integer> alreadyAdded = result.stream().map(rs -> Integer.parseInt(rs.get("id").toString())) List<Map<String, Object>> listUnitKerja = mapPegawaiJabatanToUnitKerjaDao.getMapUnitKerjaByKelompokJabatan(PENUNJANG_MEDIK);
.collect(Collectors.toList()); List<Integer> alreadyAdded = result.stream().map(rs -> Integer.parseInt(rs.get("id").toString())).collect(Collectors.toList());
List<Map<String, Object>> unitKerjaNakesLain = listUnitKerja.stream() List<Map<String, Object>> unitKerjaNakesLain = listUnitKerja.stream().filter(unitKerja -> !alreadyAdded.contains(Integer.parseInt(unitKerja.get("id").toString()))).collect(Collectors.toList());
.filter(unitKerja -> !alreadyAdded.contains(Integer.parseInt(unitKerja.get("id").toString())))
.collect(Collectors.toList());
result.addAll(unitKerjaNakesLain); result.addAll(unitKerjaNakesLain);
} }
if (CommonUtil.isNotNullOrEmpty(result)) if (CommonUtil.isNotNullOrEmpty(result)){
return result; return result;
}
return new ArrayList<>(); return new ArrayList<>();
} }

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

@ -4474,16 +4474,12 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
isDirektur = true; isDirektur = true;
levelJabatan = Integer.parseInt(map.get("levelJabatan").toString()); levelJabatan = Integer.parseInt(map.get("levelJabatan").toString());
sublevelJabatan = Integer.parseInt(map.get("subLevelJabatan").toString()); sublevelJabatan = Integer.parseInt(map.get("subLevelJabatan").toString());
break;
}
}
if (isDirektur) { System.out.println("skenario 3 = " + levelJabatan + " | " + sublevelJabatan);
result = monitoringAbsenDao.getDataPegawaiDirektur(idUnitKerja, levelJabatan, sublevelJabatan, result.addAll(monitoringAbsenDao.getDataPegawaiDirektur(idUnitKerja, levelJabatan, sublevelJabatan, splitDataSettingDatafixed("idMeninggalKeluarPindah")));
splitDataSettingDatafixed("idMeninggalKeluarPindah"));
} else if (listPegawaiSDM.contains(idPegawaiLogin)) { } else if (listPegawaiSDM.contains(idPegawaiLogin)) {
result = monitoringAbsenDao.getDataPegawaiRev(idUnitKerja, idSubUnitKerja, result.addAll(monitoringAbsenDao.getDataPegawaiRev(idUnitKerja, idSubUnitKerja, splitDataSettingDatafixed("idMeninggalKeluarPindah")));
splitDataSettingDatafixed("idMeninggalKeluarPindah")); }
} }
} }