From e765eaaa14a514d804bf87b469f67fe3366596f2 Mon Sep 17 00:00:00 2001
From: salmanoersabhk <salmanoe.rsabhk@gmail.com>
Date: Sun, 2 Oct 2022 17:48:04 +0700
Subject: [PATCH] Update LogbookKinerjaService Perbaikan query data set jabatan
 saat verifikasi logbook skoring capaian pegawai

---
 .../medifirst2000/dao/LogbookKinerjaDao.java          | 11 ++++++-----
 .../service/impl/LogbookKinerjaServiceImpl.java       |  4 ++--
 2 files changed, 8 insertions(+), 7 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 066bfdec..d144ff60 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
@@ -233,11 +233,12 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
 			@Param("unitKerjaId") Integer idUnitKerja, @Param("subunitKerjaId") Integer idSubunitKerja,
 			@Param("pegawaiId") Integer idPegawai);
 
-	@Query("select new Map(lkt.noRec as noRec,lkt.jabatanId as jabatanId) " + "from LogbookKinerja lkt "
-			+ "where to_char(lkt.bulan,'yyyy-MM') = :bulan " + "and lkt.pegawaiId = :pegawaiId "
-			+ "and lkt.indikatorKinerjaId = :indikatorId " + "and lkt.statusEnabled is true "
-			+ "and lkt.statusVerifikasi is true")
-	Map<String, Object> findKontrakByLogbook(@Param("bulan") String bulan, @Param("pegawaiId") Integer idPegawai,
+	@Query("select new Map(lkt.noRec as noRec,lkt.jabatanId as jabatanId) "
+			+ "from LogbookKinerja lkt, MapPegawaiJabatanToUnitKerja mj " + "where lkt.pegawaiId = mj.pegawaiId "
+			+ "and lkt.jabatanId = mj.jabatanId " + "and to_char(lkt.bulan,'yyyy-MM') = :bulan "
+			+ "and lkt.pegawaiId = :pegawaiId " + "and lkt.indikatorKinerjaId = :indikatorId "
+			+ "and lkt.statusEnabled is true and lkt.statusVerifikasi is true " + "and mj.statusEnabled is true")
+	Map<String, Object> findKontrakForVerify(@Param("bulan") String bulan, @Param("pegawaiId") Integer idPegawai,
 			@Param("indikatorId") Integer idIndikator);
 
 	@Query("select distinct lkt.pegawaiId " + "from LogbookKinerja lkt "
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 02e8d4a5..0b665c79 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
@@ -320,7 +320,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 	public LogbookKinerjaVO verify(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException {
 		DateFormat df = new SimpleDateFormat("yyyy-MM");
 
-		Map<String, Object> kontrak = logbookKinerjaDao.findKontrakByLogbook(df.format(vo.getBulan()),
+		Map<String, Object> kontrak = logbookKinerjaDao.findKontrakForVerify(df.format(vo.getBulan()),
 				vo.getPegawai().getId(), vo.getIndikatorKinerja().getId());
 
 		if (CommonUtil.isNullOrEmpty(kontrak)) {
@@ -351,7 +351,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 	public void autoVerify(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException {
 		DateFormat df = new SimpleDateFormat("yyyy-MM");
 
-		Map<String, Object> kontrak = logbookKinerjaDao.findKontrakByLogbook(df.format(vo.getBulan()),
+		Map<String, Object> kontrak = logbookKinerjaDao.findKontrakForVerify(df.format(vo.getBulan()),
 				vo.getPegawai().getId(), vo.getIndikatorKinerja().getId());
 		LogbookKinerja logbookKinerja = logbookKinerjaDao.findOne(kontrak.get("noRec").toString());