diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java index e6705596..a720777a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java @@ -352,6 +352,9 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository findByPegawaiId(@Param("pegawaiId") Integer pegawaiId); + @Query("select model from MapPegawaiJabatanToUnitKerja model " + "where model.statusEnabled is true") + List findAllEnabled(); + @Query("select model from MapPegawaiJabatanToUnitKerja model " + "inner join model.pegawai pg " + "where model.statusEnabled is true " + "and pg.statusEnabled is true " + "and pg.namaLengkap <> '-' " + "and lower(pg.namaLengkap) not like '%administrator%'") diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java index 29a7ad4c..06d41df8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java @@ -1,21 +1,23 @@ package com.jasamedika.medifirst2000.dao; +import com.jasamedika.medifirst2000.entities.SlipGaji; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -import com.jasamedika.medifirst2000.entities.SlipGaji; - public interface SlipGajiDao extends JpaRepository { @Query("select sg from SlipGaji sg where sg.pegawai.id = :pegawaiId and sg.bulan between :start and :end") Optional findByPegawaiAndBulan(@Param("pegawaiId") Integer pegawaiId, @Param("start") Date start, @Param("end") Date end); + @Query("select sg from SlipGaji sg where sg.bulan between :start and :end") + List findByBulan(@Param("start") Date start, @Param("end") Date end); + @Query("select pg.id from SlipGaji sg inner join sg.pegawai pg where sg.bulan between :start and :end") List findPegawaiByBulan(@Param("start") Date start, @Param("end") Date end); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java index d5848698..2feac00e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java @@ -34,4 +34,9 @@ public interface SlipGajiKomponenDao extends JpaRepository findAllByKomponen(@Param("listIdSlipGaji") List listIdSlipGaji, + @Param("idKomponen") Integer idKomponen); }