From 2b08380318983f7f954ddda4a15910a5450d6f54 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe.rsabhk@gmail.com>
Date: Thu, 6 May 2021 17:01:47 +0700
Subject: [PATCH] perbaikan fungsi mapping kontrak kinerja individu saat load
 data grid

---
 .../com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java | 6 +++---
 .../service/impl/LogbookKinerjaServiceImpl.java             | 3 ++-
 2 files changed, 5 insertions(+), 4 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 07804f3e..c4537ddd 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
@@ -43,11 +43,11 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
 			+ "from IndikatorKinerjaJabatan ikt " + "inner join ikt.indikatorKinerja ikm "
 			+ "inner join ikm.satuanIndikator si " + "where ikt.statusEnabled is true "
 			+ "and ikm.statusEnabled is true " + "and ikm.statusVerifikasi is true " + "and si.statusEnabled is true "
-			+ "and ikt.jabatanId = :jabatanId "
-			+ "and to_char(ikt.tanggalMulaiBerlaku,'yyyy-MM') <= to_char(now(),'yyyy-MM') "
+			+ "and ikt.jabatanId = :jabatanId " + "and to_char(ikt.tanggalMulaiBerlaku,'yyyy-MM') <= :bulan "
 			+ "order by ikm.jenisIndikator, ikm.namaIndikator, "
 			+ "ikt.tanggalMulaiBerlaku desc, ikt.tanggalPembaharuanData desc")
-	List<Map<String, Object>> findIndikatorByJabatan(@Param("jabatanId") Integer idJabatan);
+	List<Map<String, Object>> findIndikatorByJabatan(@Param("jabatanId") Integer idJabatan,
+			@Param("bulan") String bulan);
 
 	@Query("select new Map(lkh.noRec as noRec,ikm.jenisIndikator as jenisIndikatorId,"
 			+ "ikm.id as indikatorId,ikm.namaIndikator as namaIndikator,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
index aca6e3eb..24b1ff97 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
@@ -254,7 +254,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> listIdIndikator = new ArrayList<>();
 		DateFormat df = new SimpleDateFormat("yyyy-MM");
 
-		List<Map<String, Object>> listMap = logbookKinerjaDao.findIndikatorByJabatan(idJabatan);
+		List<Map<String, Object>> listMap = logbookKinerjaDao.findIndikatorByJabatan(idJabatan,
+				df.format(new Date(bulan)));
 		List<Map<String, Object>> data = logbookKinerjaDao.findKontrakKinerja(idPegawai, idJabatan,
 				df.format(new Date(bulan)));