diff --git a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
index 04f43c08..dcbeb5ed 100644
--- a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
@@ -2089,7 +2089,7 @@
-
+
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
index 4f889106..311f4484 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
@@ -3,10 +3,14 @@ package com.jasamedika.medifirst2000.dao;
import com.jasamedika.medifirst2000.entities.GolonganPPPK;
import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.Optional;
+
/**
* @author Salman
* @version 1.0.0
* @since 2/21/2025
*/
public interface GolonganPPPKDao extends JpaRepository {
+
+ Optional findById(String id);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
index f855c509..59a87188 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
@@ -1,13 +1,14 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import com.jasamedika.medifirst2000.entities.IkiDanRemunerasi;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.IkiDanRemunerasi;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@Repository("IkiDanRemunerasiDao")
public interface IkiDanRemunerasiDao extends PagingAndSortingRepository {
@@ -22,14 +23,16 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository getEvaluasiJabatan(@Param("id") Integer id);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java
index 183f33ac..178f96ab 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java
@@ -1,15 +1,14 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.MonitoringAbsen;
+import com.jasamedika.medifirst2000.entities.Pegawai;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.MonitoringAbsen;
-import com.jasamedika.medifirst2000.entities.Pegawai;
+import java.util.List;
+import java.util.Map;
@Repository("MonitoringAbsenDao")
public interface MonitoringAbsenDao extends PagingAndSortingRepository {
@@ -125,12 +124,13 @@ public interface MonitoringAbsenDao extends PagingAndSortingRepository findPegawaiaAktifDanKaryawanByRuangan(@Param("idUnitKerja") Integer idUnitKerja);
@Query("select new Map(pegawai.id as idPegawai," + "pegawai.namaLengkap as nama," + "pegawai.nipPns as nipPns,"
- + "golongan.golonganPegawai as namaGolongan," + "jabatanInternal.namaJabatan as jabatanInternal,"
- + "unitKerja.name as unitKerja," + "shiftKerja.id as idKelompokShiftKerja,"
- + "shiftKerja.name as shiftKerja," + "shiftKerja.operatorFactorRate as headOperatorFactorRate,"
- + "shiftKerja.factorRate as headFactorRate) " + "from MapPegawaiJabatanToUnitKerja mapPegawai "
- + "left join mapPegawai.pegawai pegawai " + "left join pegawai.shiftKerja shiftKerja "
- + "left join pegawai.golonganPegawai golongan " + "left join mappegawai.jabatan jabatanInternal "
+ + "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK,"
+ + "jabatanInternal.namaJabatan as jabatanInternal," + "unitKerja.name as unitKerja,"
+ + "shiftKerja.id as idKelompokShiftKerja," + "shiftKerja.name as shiftKerja,"
+ + "shiftKerja.operatorFactorRate as headOperatorFactorRate," + "shiftKerja.factorRate as headFactorRate) "
+ + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai "
+ + "left join pegawai.shiftKerja shiftKerja " + "left join pegawai.golonganPegawai golongan "
+ + "left join pegawai.golonganPPPK golonganPPPK " + "left join mappegawai.jabatan jabatanInternal "
+ "left join mapPegawai.subUnitKerjaPegawai subUnitKerja "
+ "left join mapPegawai.unitKerjaPegawai unitKerja " + "where pegawai.statusEnabled is true "
+ "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollPegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollPegawaiDao.java
index c413584a..61f4d740 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollPegawaiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollPegawaiDao.java
@@ -1,317 +1,207 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.Pegawai;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.Pegawai;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@Repository("PayRollPegawaiDao")
public interface PayRollPegawaiDao extends PagingAndSortingRepository {
-
- @Query("select new Map(model.id as id,"
- + "detailkategoripegawai.id as detailKatogoriId,"
- + "rangemasakerja.id as rangeMasaKerjaId,"
- + "pendidikan.id as pendidikanId,"
- + "komponenharga.id as komponenHargaId,"
- + "model.hargaSatuan as hargaSatuan,"
- + "model.factorRate as factorRate) "
- + "from PegawaiStrukturGajiByMaKaPe model "
- + "left join model.detailKategoriPegawai detailkategoripegawai "
- + "left join model.pendidikan pendidikan "
- + "left join model.komponenHarga komponenharga "
- + "left join model.rangeMasaKerja rangemasakerja "
+
+ @Query("select new Map(model.id as id," + "detailkategoripegawai.id as detailKatogoriId,"
+ + "rangemasakerja.id as rangeMasaKerjaId," + "pendidikan.id as pendidikanId,"
+ + "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+ + "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByMaKaPe model "
+ + "left join model.detailKategoriPegawai detailkategoripegawai " + "left join model.pendidikan pendidikan "
+ + "left join model.komponenHarga komponenharga " + "left join model.rangeMasaKerja rangemasakerja "
+ "where model.detailKategoriPegawai.id=:idDetailKategoriPegawai and "
+ "model.rangeMasaKerja.id=:idRangeMasaKerja and model.pendidikan.id=:idPendidikan")
- List