diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java index fe94284f..deb6b9b7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java @@ -69,8 +69,8 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository> findUsedKontrakByMapping(@Param("indikatorId") Integer idIndikator, @Param("jabatanId") Integer idJabatan); - @Query("select new Map(ikm.jenisIndikator as jenisIndikatorId," + @Query("select new Map(jb.kelompokJabatanId as kelompokJabatanId," + "ikm.jenisIndikator as jenisIndikatorId," + "(case when ikm.jenisIndikator = 1 then 'Kuantitas' " + "when ikm.jenisIndikator = 2 then 'Kualitas' " + "when ikm.jenisIndikator = 3 then 'Perilaku' end) as jenisIndikator," + "ikm.id as indikatorId,ikm.namaIndikator as namaIndikator," + "si.id as satuanId,si.satuanIndikator as satuan," + "lkt.bobot as bobot," + "lkt.target as target," - + "lkt.capaian as realisasi) " + "from LogbookKinerja lkt " - + "inner join lkt.indikatorKinerja ikm inner join ikm.satuanIndikator si " + + "lkt.capaian as realisasi) " + "from LogbookKinerja lkt " + "inner join lkt.jabatan jb " + + "inner join lkt.indikatorKinerja ikm " + "inner join ikm.satuanIndikator si " + "where lkt.statusEnabled is true and lkt.statusVerifikasi is true " + "and ikm.statusEnabled is true and ikm.statusVerifikasi is true " + "and si.statusEnabled is true " + "and lkt.pegawaiId = :pegawaiId " + "and lkt.jabatanId = :jabatanId " @@ -177,9 +177,9 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository