From 0b81bd30e137879f4919055a05ea91001d3b2753 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 12 Apr 2021 10:36:36 +0700 Subject: [PATCH] perbaikan fungsi get data penempatan evaluasi jabatan --- .../dao/NilaiKelompokJabatanDao.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java index 5174d251..b4080d59 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java @@ -46,16 +46,17 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository findIdsByGrade(@Param("grade") String grade); - @Query("select new Map(pg.id as idPegawai,pg.namaLengkap as namaPegawai," - + "j.namaExternal as unitKerja,j.namaJabatan as namaJabatan," - + "pg.nilaiJabatan as nilaiJabatan,pg.grade as grade," + @Query("select distinct new Map(pg.id as idPegawai,pg.namaLengkap as namaPegawai," + "uk.name as unitKerja," + + "j.namaJabatan as namaJabatan," + "ej.totalNilai as nilaiJabatan," + "dkj.gradeDesc as grade," + "kj.id as idKelompokJabatan,kj.namaKelompokJabatan as kelompokJabatan," + "dkj.id as idDetailKelompokJabatan,dkj.detailKelompokJabatan as detailKelompokJabatan) " - + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan j " - + "inner join j.kelompokJabatan kj " + "inner join pg.detailKelompokJabatan dkj " - + "where kj.id = dkj.kelompokJabatanId " + "and mj.statusEnabled is true " + "and pg.statusEnabled is true " - + "and j.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) " + "order by pg.id asc, " - + "pg.nilaiJabatan desc") + + "from MapPegawaiJabatanToUnitKerja mj, EvaluasiJabatan ej " + "inner join mj.pegawai pg " + + "inner join mj.jabatan j " + "inner join j.unitKerja uk " + "inner join ej.grade dkj " + + "inner join dkj.kelompokJabatan kj " + "where mj.jabatanId = ej.jabatanId and j.id = ej.jabatanId " + + "and mj.jabatanId = j.id " + "and mj.unitKerjaPegawaiId = uk.id " + "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 kj.statusEnabled is true " + + "and pg.kategoryPegawaiId in (:listKategoriId) " + "order by pg.namaLengkap, pg.id, ej.totalNilai desc") public List> findPenempatanEvaluasiJabatan( @Param("listKategoriId") List idListKategori);