From 1b8f2fcea29afc7c139b6222e0e22c5bb92f83bd Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 1 Feb 2022 16:07:53 +0700
Subject: [PATCH] Update logbookKinerjaDao Penambahan property kelompok jabatan
 untuk validasi maksimal iki di dashboard pencatatan kinerja, penilaian
 kinerja individu, dan rekap penilaian kinerja individu

---
 .../medifirst2000/dao/LogbookKinerjaDao.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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<LogbookKin
 
 	@Query("select new Map(lk.noRec as noRec," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
 			+ "coalesce(mj.nilaiJabatan,0) as nilaiJabatan," + "jb.id as idJabatan,jb.namaJabatan as namaJabatan,"
-			+ "ik.jenisIndikator as idJenisIndikator," + "(case when ik.jenisIndikator = 1 then 'Kuantitas' "
-			+ "when ik.jenisIndikator = 2 then 'Kualitas' "
+			+ "jb.kelompokJabatanId as kelompokJabatanId," + "ik.jenisIndikator as idJenisIndikator,"
+			+ "(case when ik.jenisIndikator = 1 then 'Kuantitas' " + "when ik.jenisIndikator = 2 then 'Kualitas' "
 			+ "when ik.jenisIndikator = 3 then 'Perilaku' end) as jenisIndikator,"
 			+ "ik.id as idIndikator,ik.namaIndikator as namaIndikator,"
 			+ "si.id as satuanId,si.satuanIndikator as satuanIndikator,"
@@ -161,13 +161,13 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
 	List<Map<String, Object>> 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<LogbookKin
 
 	String strQryIKI = "select new Map(uk.id as unitKerjaId,uk.name as unitKerja,"
 			+ "sk.id as subunitKerjaId,sk.name as subunitKerja," + "pg.id as pegawaiId,pg.namaLengkap as namaLengkap,"
-			+ "jb.id as jabatanId,jb.namaJabatan as namaJabatan,mj.nilaiJabatan as nilaiJabatan,"
-			+ "ikm.jenisIndikator as jenisIndikatorId," + "(case when ikm.jenisIndikator = 1 then 'Kuantitas' "
-			+ "when ikm.jenisIndikator = 2 then 'Kualitas' "
+			+ "jb.id as jabatanId,jb.namaJabatan as namaJabatan,jb.kelompokJabatanId as kelompokJabatanId,"
+			+ "mj.nilaiJabatan as nilaiJabatan," + "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,"
 			+ "lkt.bobot as bobot,lkt.target as target,lkt.capaian as realisasi) "