perbaikan service data penempatan evaluasi jabatan
This commit is contained in:
parent
61ccbe032e
commit
b8cdebe9d9
@ -62,7 +62,7 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
|
|||||||
+ "and mj.statusEnabled is true " + "and ej.statusEnabled is true " + "and pg.statusEnabled is true "
|
+ "and mj.statusEnabled is true " + "and ej.statusEnabled is true " + "and pg.statusEnabled is true "
|
||||||
+ "and j.statusEnabled is true " + "and uk.statusEnabled is true " + "and dkj.statusEnabled is true "
|
+ "and j.statusEnabled is true " + "and uk.statusEnabled is true " + "and dkj.statusEnabled is true "
|
||||||
+ "and kj.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) "
|
+ "and kj.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) "
|
||||||
+ "order by pg.namaLengkap, pg.id, ej.totalNilai desc")
|
+ "order by pg.namaLengkap")
|
||||||
public List<Map<String, Object>> findPenempatanEvaluasiJabatan(
|
public List<Map<String, Object>> findPenempatanEvaluasiJabatan(
|
||||||
@Param("listKategoriId") List<Integer> idListKategori);
|
@Param("listKategoriId") List<Integer> idListKategori);
|
||||||
|
|
||||||
|
|||||||
@ -122,29 +122,9 @@ public class NilaiKelompokJabatanServiceImpl extends BaseVoServiceImpl implement
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Map<String, Object>> getPenempatanEvaluasiJabatan() {
|
public List<Map<String, Object>> getPenempatanEvaluasiJabatan() {
|
||||||
List<Map<String, Object>> result = new ArrayList<>();
|
List<Map<String, Object>> result = nilaiKelompokJabatanDao
|
||||||
List<Integer> listIdPegawai = new ArrayList<>();
|
|
||||||
|
|
||||||
List<Map<String, Object>> data = nilaiKelompokJabatanDao
|
|
||||||
.findPenempatanEvaluasiJabatan(Arrays.asList(Master.KategoryPegawai.REMUN));
|
.findPenempatanEvaluasiJabatan(Arrays.asList(Master.KategoryPegawai.REMUN));
|
||||||
|
|
||||||
if (CommonUtil.isNotNullOrEmpty(data)) {
|
|
||||||
for (Map<String, Object> map : data) {
|
|
||||||
if (!listIdPegawai.contains(map.get("idPegawai"))) {
|
|
||||||
listIdPegawai.add(Integer.valueOf(map.get("idPegawai").toString()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Integer idPegawai : listIdPegawai) {
|
|
||||||
for (Map<String, Object> map : data) {
|
|
||||||
if (map.get("idPegawai").equals(idPegawai)) {
|
|
||||||
result.add(map);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user