From 6b25124b4e2e6e00948d3b161f66aaaa59abcc3a Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe.rsabhk@gmail.com>
Date: Sun, 18 Apr 2021 13:15:24 +0700
Subject: [PATCH] - Analisis fitur hapus mapping indikator jabatan di kontrak
 kinerja - Menambahkan fungsi edit nilai terendah dan nilai tertinggi grade di
 menu anggaran remunerasi bagian plafon

---
 .../medifirst2000/dao/LogbookKinerjaDao.java    |  2 +-
 .../dao/NilaiKelompokJabatanDao.java            |  1 +
 .../IndikatorKinerjaJabatanServiceImpl.java     | 17 +++++++++++------
 .../service/impl/LogbookKinerjaServiceImpl.java |  1 +
 .../impl/NilaiKelompokJabatanServiceImpl.java   |  2 ++
 5 files changed, 16 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 a045659c..666842f1 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
@@ -39,7 +39,7 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
 
 	@Query("select new Map(ikm.jenisIndikator as jenisIndikatorId,ikm.id as indikatorId,ikm.namaIndikator as namaIndikator,"
 			+ "si.id as satuanId,si.satuanIndikator as satuanIndikator,"
-			+ "ikt.tanggalMulaiBerlaku as tglBerlaku,ikt.tanggalPembaharuanData as tglPembaharuanData) "
+			+ "ikt.noRec as noRecMap,ikt.tanggalMulaiBerlaku as tglBerlaku,ikt.tanggalPembaharuanData as tglPembaharuanData) "
 			+ "from IndikatorKinerjaJabatan ikt " + "inner join ikt.indikatorKinerja ikm "
 			+ "inner join ikm.satuanIndikator si " + "where ikt.statusEnabled is true "
 			+ "and ikm.statusEnabled is true " + "and si.statusEnabled is true " + "and ikt.jabatanId = :jabatanId "
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 b4080d59..e0cb5e0a 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
@@ -34,6 +34,7 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
 			@Param("detailKelompokJabatanId") Integer detailKelompokJabatanId);
 
 	@Query("select distinct new Map(ar.noRec as noRec," + "cast(nj.gradeDesc as integer) as grade,"
+			+ "nj.nilaiTerendah as nilaiTerendah," + "nj.nilaiTertinggi as nilaiTertinggi,"
 			+ "nj.gajiHonorarium as gajiHonorarium," + "nj.minInsentif as minInsentif,"
 			+ "nj.maxInsentif as maxInsentif," + "nj.maxTotalRemunerasi as maxTotalRemunerasi,"
 			+ "ar.tanggalPembaharuanData) " + "from NilaiKelompokJabatan nj, " + "AnggaranRemunerasi ar "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java
index 2d2a0a3e..702b0b5b 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java
@@ -204,15 +204,20 @@ public class IndikatorKinerjaJabatanServiceImpl extends BaseVoServiceImpl implem
 	public IndikatorKinerjaJabatanVO update(IndikatorKinerjaJabatanVO vo)
 			throws JpaSystemException, ServiceVOException {
 		IndikatorKinerjaJabatan indikatorJabatanLama = indikatorKinerjaJabatanDao.findOne(vo.getNoRec());
-
-		Jabatan jabatan = jabatanConverter.transferVOToModel(vo.getJabatan(), new Jabatan());
-		IndikatorKinerja indikator = indikatorConverter.transferVOToModel(vo.getIndikatorKinerja(),
-				new IndikatorKinerja());
 		IndikatorKinerjaJabatan indikatorJabatanBaru = indikatorJabatanConverter.transferVOToModel(vo,
 				indikatorJabatanLama);
 
-		indikatorJabatanBaru.setJabatan(jabatan);
-		indikatorJabatanBaru.setIndikatorKinerja(indikator);
+		if (CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
+			Jabatan jabatan = jabatanConverter.transferVOToModel(vo.getJabatan(), new Jabatan());
+			indikatorJabatanBaru.setJabatan(jabatan);
+		}
+
+		if (CommonUtil.isNotNullOrEmpty(vo.getIndikatorKinerja())) {
+			IndikatorKinerja indikator = indikatorConverter.transferVOToModel(vo.getIndikatorKinerja(),
+					new IndikatorKinerja());
+			indikatorJabatanBaru.setIndikatorKinerja(indikator);
+		}
+
 		indikatorJabatanBaru.setTanggalPembaharuanData(new Date());
 		IndikatorKinerjaJabatan resultModel = indikatorKinerjaJabatanDao.save(indikatorJabatanBaru);
 
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 c2884278..d2b2b8d6 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
@@ -261,6 +261,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Map<String, Object>> data = logbookKinerjaDao.findKontrakKinerja(idPegawai, idJabatan,
 				df.format(new Date(bulan)));
 		for (Map<String, Object> res : listRes) {
+			res.put("noRecMap", res.get("noRecMap"));
 			for (Map<String, Object> map : data) {
 				if (res.get("indikatorId").equals(map.get("indikatorId"))) {
 					res.put("noRec", map.get("noRec"));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
index b41ec95f..78ac613b 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
@@ -63,6 +63,8 @@ public class NilaiKelompokJabatanServiceImpl extends BaseVoServiceImpl implement
 		List<NilaiKelompokJabatan> models = new ArrayList<NilaiKelompokJabatan>();
 		for (Integer id : listId) {
 			NilaiKelompokJabatan model = nilaiKelompokJabatanDao.findOne(id);
+			model.setNilaiTerendah(vo.getNilaiTerendah());
+			model.setNilaiTertinggi(vo.getNilaiTertinggi());
 			model.setGajiHonorarium(vo.getGajiHonorarium());
 			model.setMinInsentif(vo.getMinInsentif());
 			model.setMaxInsentif(vo.getMaxInsentif());