From c46d623c86a79acb70394abc8373f13f12048724 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 24 Feb 2025 09:05:40 +0700 Subject: [PATCH] Update service kepegawaian Penerapan golongan pppk untuk endpoints view terdampak --- .../medifirst2000/dao/GolonganPPPKDao.java | 4 + .../dao/IkiDanRemunerasiDao.java | 15 +- .../medifirst2000/dao/MonitoringAbsenDao.java | 22 +- .../medifirst2000/dao/PayRollPegawaiDao.java | 444 +++++++----------- .../dao/PayRollReportingDao.java | 127 ++--- .../medifirst2000/dao/PegawaiDao.java | 82 ++-- .../medifirst2000/dao/PegawaiSKGajiDao.java | 261 ++++------ .../medifirst2000/dao/PegawaiSKPajakDao.java | 102 ++-- .../dao/PlanningPegawaiMuSaReDao.java | 370 +++++---------- .../dao/PlanningPegawaiStatusDao.java | 21 +- .../custom/impl/GajiPegawaiDaoCustomImpl.java | 18 +- .../dao/custom/impl/PegawaiDaoCustomImpl.java | 49 +- .../service/impl/GajiPegawaiServiceImpl.java | 53 +-- .../impl/PayRollReportingServiceImpl.java | 27 +- .../PegawaiMutasiSanksiResignServiceImpl.java | 60 +-- .../service/impl/PegawaiServiceImpl.java | 7 + 16 files changed, 632 insertions(+), 1030 deletions(-) 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> findGajiByMakape(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai, - @Param("idRangeMasaKerja")Integer idRangeMasaKerja, - @Param("idPendidikan")Integer idPendidikan); + List> findGajiByMakape(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai, + @Param("idRangeMasaKerja") Integer idRangeMasaKerja, @Param("idPendidikan") Integer idPendidikan); - @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.pendidikan.id=:idPendidikan") - List> findGajiByMakape(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai, - @Param("idPendidikan")Integer idPendidikan); + List> findGajiByMakape(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai, + @Param("idPendidikan") Integer idPendidikan); - @Query("select new Map(model.id as id," - + "jabatan.id as jabatanId," - + "komponenharga.id as komponenHargaId," - + "model.hargaSatuan as hargaSatuan," - + "model.factorRate as factorRate) " - + "from PegawaiStrukturGajiByJa model " - + "left join model.jabatan jabatan " - + "left join model.komponenHarga komponenharga " - + "where jabatan.id=:idJabatan and komponenharga.id=57") - List> findGajiByJa(@Param("idJabatan")Integer idJabatan); - - @Query("select new Map(model.id as id," - + "jabatan.id as jabatanId," - + "pendidikan.id as pendidikanId," - + "komponenHarga.id as komponenHargaId," - + "model.hargaSatuan as hargaSatuan," - + "model.factorRate as factorRate) " - + "from PegawaiStrukturGajiByJaPe model " - + "left join model.jabatan jabatan " - + "left join model.pendidikan pendidikan " + @Query("select new Map(model.id as id," + "jabatan.id as jabatanId," + "komponenharga.id as komponenHargaId," + + "model.hargaSatuan as hargaSatuan," + "model.factorRate as factorRate) " + + "from PegawaiStrukturGajiByJa model " + "left join model.jabatan jabatan " + + "left join model.komponenHarga komponenharga " + "where jabatan.id=:idJabatan and komponenharga.id=57") + List> findGajiByJa(@Param("idJabatan") Integer idJabatan); + + @Query("select new Map(model.id as id," + "jabatan.id as jabatanId," + "pendidikan.id as pendidikanId," + + "komponenHarga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan," + + "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByJaPe model " + + "left join model.jabatan jabatan " + "left join model.pendidikan pendidikan " + "left join model.komponenHarga komponenharga " + "where jabatan.id=:idJabatan and pendidikan.id=:idPendidikan") - List> findGajiByJaPe(@Param("idJabatan")Integer idJabatan, - @Param("idPendidikan")Integer idPendidikan); + List> findGajiByJaPe(@Param("idJabatan") Integer idJabatan, + @Param("idPendidikan") Integer idPendidikan); - @Query("select new Map(model.id as id," - + "leveltingkat.id as levelTingkatId," - + "jabatan.id as jabatanId," - + "komponenharga.id as komponenHargaId," - + "model.hargaSatuan as hargaSatuan," - + "model.factorRate as factorRate) " - + "from PegawaiStrukturGajiByLTJa model " - + "left join model.levelTingkat leveltingkat " - + "left join model.jabatan jabatan " + @Query("select new Map(model.id as id," + "leveltingkat.id as levelTingkatId," + "jabatan.id as jabatanId," + + "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan," + + "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByLTJa model " + + "left join model.levelTingkat leveltingkat " + "left join model.jabatan jabatan " + "left join model.komponenHarga komponenharga " + "where jabatan.id=:idJabatan and leveltingkat.id=:idLevelTingkat") - List> findGajiByLTJa(@Param("idJabatan")Integer idJabatan, - @Param("idLevelTingkat")Integer idLevelTingkat); + List> findGajiByLTJa(@Param("idJabatan") Integer idJabatan, + @Param("idLevelTingkat") Integer idLevelTingkat); - @Query("select new Map(model.id as id," - + "rekanan.id as rekananId," - + "rekanan.namaRekanan as namaRekanan," - + "komponenharga.id as komponenHargaId," - + "komponenharga.komponenHarga as namaKomponenHarga," - + "model.hargaSatuanPremi as hargaSatuanPremi," - + "model.persenHargaSatuanPremi as persenHargaSatuanPremi," - + "model.factorRate as factorRate," - + "model.totalFactorRatePremi as totalFactorRatePremi," - + "model.isByMonth as isByMonth," - + "model.isByYear as isByYear," - + "model.keteranganLainnya as keteranganLainnya) " - + "from PegawaiSKAsuransi model " - + "left join model.rekanan rekanan " - + "left join model.komponenHarga komponenharga " + @Query("select new Map(model.id as id," + "rekanan.id as rekananId," + "rekanan.namaRekanan as namaRekanan," + + "komponenharga.id as komponenHargaId," + "komponenharga.komponenHarga as namaKomponenHarga," + + "model.hargaSatuanPremi as hargaSatuanPremi," + "model.persenHargaSatuanPremi as persenHargaSatuanPremi," + + "model.factorRate as factorRate," + "model.totalFactorRatePremi as totalFactorRatePremi," + + "model.isByMonth as isByMonth," + "model.isByYear as isByYear," + + "model.keteranganLainnya as keteranganLainnya) " + "from PegawaiSKAsuransi model " + + "left join model.rekanan rekanan " + "left join model.komponenHarga komponenharga " + "where model.rekanan.id=:idRekananPenjamin and komponenharga.id=:idKomponenHarga " + "and model.statusEnabled=true") - List> findGajiByAsuransi(@Param("idRekananPenjamin")Integer idRekananPenjamin, - @Param("idKomponenHarga")Integer idKomponenHarga); + List> findGajiByAsuransi(@Param("idRekananPenjamin") Integer idRekananPenjamin, + @Param("idKomponenHarga") Integer idKomponenHarga); - @Query("select new Map(model.id as id," - + "golonganpegawai.id as golonganPegawaiId," - + "komponenharga.id as komponenHargaId," - + "model.hargaSatuan as hargaSatuan," - + "model.factorRate as factorRate) " - + "from PegawaiStrukturGajiByGolongan model " - + "left join model.golonganPegawai golonganpegawai " - + "left join model.komponenHarga komponenharga " + @Query("select new Map(model.id as id," + "golonganpegawai.id as golonganPegawaiId," + + "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan," + + "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByGolongan model " + + "left join model.golonganPegawai golonganpegawai " + "left join model.komponenHarga komponenharga " + "where golonganpegawai.id=:idGolonganPegawai and komponenharga.id=:idKomponenHarga") - List> findGajiByGolongan(@Param("idGolonganPegawai")Integer idGolonganPegawai, - @Param("idKomponenHarga")Integer idKomponenHarga); + List> findGajiByGolongan(@Param("idGolonganPegawai") Integer idGolonganPegawai, + @Param("idKomponenHarga") Integer idKomponenHarga); - @Query("select new Map(model.id as id," - + "golonganpegawai.id as golonganPegawaiId," - + "objekpajak.id as objekPajakId," - + "objekpajak.objekPajak as objekPajak," - + "range.id as rangeId," - + "model.persenPajak as persenPajak," - + "model.keteranganLainnya as keteranganLainnya) " - + "from PegawaiSKPajak model " - + "left join model.objekPajak objekpajak " - + "left join model.golonganPegawai golonganpegawai " - + "left join model.range range " - + "where :idObjekPajak=:idObjekPajak and golonganpegawai.id=:idGolongaPegawai and " - + "range.id=:idRange") - List> findGajiByPajak(@Param("idObjekPajak")Integer idObjekPajak, - @Param("idGolongaPegawai")Integer idGolongaPegawai,@Param("idRange")Integer idRange); + @Query("select new Map(model.id as id," + "golonganpegawai.id as golonganPegawaiId," + + "objekpajak.id as objekPajakId," + "objekpajak.objekPajak as objekPajak," + "range.id as rangeId," + + "model.persenPajak as persenPajak," + "model.keteranganLainnya as keteranganLainnya) " + + "from PegawaiSKPajak model " + "left join model.objekPajak objekpajak " + + "left join model.golonganPegawai golonganpegawai " + "left join model.range range " + + "where :idObjekPajak=:idObjekPajak and golonganpegawai.id=:idGolongaPegawai and " + "range.id=:idRange") + List> findGajiByPajak(@Param("idObjekPajak") Integer idObjekPajak, + @Param("idGolongaPegawai") Integer idGolongaPegawai, @Param("idRange") Integer idRange); - @Query("select new Map(model.id," - + "model.golonganPegawai.id," - + "model.objekPajak.id," - + "model.range.id," - + "model.persenPajak," - + "model.keteranganLainnya) " - + "from PegawaiSKPajak model " + @Query("select new Map(model.id," + "model.golonganPegawai.id," + "model.objekPajak.id," + "model.range.id," + + "model.persenPajak," + "model.keteranganLainnya) " + "from PegawaiSKPajak model " + "where model.objekPajak.id=:idObjekPajak and model.golonganPegawai.id=:idGolongaPegawai and " + "model.range.id=:idRange") - List> findPegawaiByDetailKategory(@Param("idObjekPajak")Integer idObjekPajak, - @Param("idGolongaPegawai")Integer idGolongaPegawai,@Param("idRange")Integer idRange); + List> findPegawaiByDetailKategory(@Param("idObjekPajak") Integer idObjekPajak, + @Param("idGolongaPegawai") Integer idGolongaPegawai, @Param("idRange") Integer idRange); - @Query("select new Map (model.namaLengkap as namaLengkap," - +"golonganpegawai.golonganPegawai as golonganPegawai," - +"golonganpegawai.id as golonganPegawaiId," - + "pendidikan.namaPendidikan as pendidikan," - + "pendidikan.id as pendidikanId," - +"jabatanfungsional.id as jabatanId," - +"jabatanfungsional.namaJabatan as namaJabatan," - +"detailkategoripegawai.id as detailKategoriPegawaiId," - +"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," - + "model.nipPns as nipPns," - + "statuspegawai.statusPegawai as statusPegawai," - +"kategoripegawai.kategoryPegawai as kategoriPegawai," - + "model.tglMasuk as tglMasuk," - + "model.id as pegawaiId," - + "kelompokshift.id as kelompokShiftId," - + "ruangan.id as ruanganId," - + "ruangan.namaRuangan as namaRuangan) " - +"from Pegawai model " - +"left join model.golonganPegawai golonganpegawai " - +"left join model.pendidikan pendidikan " - +"left join model.jabatanFungsional jabatanfungsional " - +"left join model.detailKategoryPegawai detailkategoripegawai " - +"left join detailkategoripegawai.kategoryPegawai kategoripegawai " - + "left join model.statusPegawai statuspegawai " - + "left join model.shiftKerja kelompokshift " + @Query("select new Map (model.namaLengkap as namaLengkap," + "golonganpegawai.golonganPegawai as golonganPegawai," + + "golonganpegawai.id as golonganPegawaiId," + "golonganPPPK.namaGolongan as golonganPPPK," + + "golonganPPPK.id as golonganPPPKId," + "pendidikan.namaPendidikan as pendidikan," + + "pendidikan.id as pendidikanId," + "jabatanfungsional.id as jabatanId," + + "jabatanfungsional.namaJabatan as namaJabatan," + "detailkategoripegawai.id as detailKategoriPegawaiId," + + "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," + "model.nipPns as nipPns," + + "statuspegawai.statusPegawai as statusPegawai," + "kategoripegawai.kategoryPegawai as kategoriPegawai," + + "model.tglMasuk as tglMasuk," + "model.id as pegawaiId," + "kelompokshift.id as kelompokShiftId," + + "ruangan.id as ruanganId," + "ruangan.namaRuangan as namaRuangan) " + "from Pegawai model " + + "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK " + + "left join model.pendidikan pendidikan " + "left join model.jabatanFungsional jabatanfungsional " + + "left join model.detailKategoryPegawai detailkategoripegawai " + + "left join detailkategoripegawai.kategoryPegawai kategoripegawai " + + "left join model.statusPegawai statuspegawai " + "left join model.shiftKerja kelompokshift " + "left join model.ruangan ruangan " - +"where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 " + + "where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 " + "order by model.namaLengkap") - List> findPegawaiByDetailKategori(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai); - - @Query("select new Map(model.id as id, " - + "model.komponenHarga as komponenHarga) " - + "from KomponenHarga model " + List> findPegawaiByDetailKategori( + @Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); + + @Query("select new Map(model.id as id, " + "model.komponenHarga as komponenHarga) " + "from KomponenHarga model " + "where model.id=:idKomponenHarga") - Map findKomponenHargaNameById(@Param("idKomponenHarga")Integer idKomponenHarga); - - @Query("select new Map(model.id as id, " - + "model.objekPajak as objekPajak) " - + "from ObjekPajak model " - + "where model.id=:idObjekPajak") - Map findObjekPajakById(@Param("idObjekPajak")Integer idObjekPajak); - - @Query("select new Map(model.id as id) from Range model where namarange='Range Masa Kerja' and (rangemin<=:umur and rangemax>=:umur)") - Map findRangeId(@Param("umur")Integer umur); - - @Query("select new Map(model.id as id,model.detailKategoryPegawai as detailKategoryPegawai) from DetailKategoryPegawai model where model.id in (:ids)") - List> findDetailKategoryPegawaiBluPkwt(@Param("ids")List ids); - - @Query("select new Map(model.id as id,model.name as name) from JenisGaji model") - List> findAllJenisGaji(); - - @Query("select new Map(kelompokshift.id as kelompokShifId,kelompokshift.kelompokShiftKerja as kelompokShiftKerja," - +"shiftkerja.id as shiftKerjaId,shiftkerja.namaShift as shiftKerja," - + "komponenindex.id as komponenIndexId," - + "komponenindex.komponenIndex as komponenIndex) " - + "from MapKelompokShiftToShift model " - +"left join model.kelompokShift kelompokshift " - +"left join model.shiftKerja shiftkerja " - +"left join shiftkerja.komponenIndex komponenindex " - +"where kelompokshift.id = :idKelompokShift") - List> findKomponenIndexByIdKelompokShift(@Param("idKelompokShift")Integer idKelompokShift); - - @Query("select new Map(sum(model.nilaiIndex) as sumNilaiIndex," - + "pegawai.id as pegawaiId," - + "ruangan.id as ruaganId ) " - + "from PegawaiHistoriRekapIndex model " - +"left join model.komponenIndex komponenindex " - +"left join model.strukHistory strukhistory " - +"left join model.pegawai pegawai " - +"left join strukhistory.ruangan ruangan " - +"where komponenindex.id in (:listKomponenIndex) and ruangan.id=:idRuangan and pegawai.id=:idPegawai " - + "and to_char(strukhistory.tglAwal,'mm-yyyy')=:periodeBulan " - +"group by pegawai.id,ruangan.id") - Map getJumlahHari(@Param("listKomponenIndex")List listKomponenIndex,@Param("idRuangan")Integer idRuangan, - @Param("idPegawai")Integer idPegawai, - @Param("periodeBulan")String periodeBulan); - - @Query("select new Map(model.id as id," - + "golonganpegawai.id as golonganPegawaiId," - + "komponenharga.id as komponenHargaId," - + "model.hargaSatuan as hargaSatuan," - + "model.factorRate as factorRate) " - + "from PegawaiStrukturGajiByGolongan model " - + "left join model.golonganPegawai golonganpegawai " - + "left join model.komponenHarga komponenharga " - + "where komponenharga.id=:idKomponenHarga") - List> findGajiHarianLepas(@Param("idKomponenHarga")Integer idKomponenHarga); + Map findKomponenHargaNameById(@Param("idKomponenHarga") Integer idKomponenHarga); - @Query("select new Map (model.namaLengkap as namaLengkap," - +"golonganpegawai.golonganPegawai as golonganPegawai," - +"golonganpegawai.id as golonganPegawaiId," - + "pendidikan.namaPendidikan as pendidikan," - + "pendidikan.id as pendidikanId," - +"jabatanfungsional.id as jabatanId," - +"jabatanfungsional.namaJabatan as namaJabatan," - +"detailkategoripegawai.id as detailKategoriPegawaiId," - +"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," - + "model.nipPns as nipPns," - + "statuspegawai.statusPegawai as statusPegawai," - +"kategoripegawai.kategoryPegawai as kategoriPegawai," - + "model.tglMasuk as tglMasuk," - + "model.id as pegawaiId," - + "kelompokshift.id as kelompokshiftId," - + "ruangan.id as ruanganId," - + "ruangan.namaRuangan as namaRuangan) " - +"from Pegawai model " - +"left join model.golonganPegawai golonganpegawai " - +"left join model.pendidikan pendidikan " - +"left join model.jabatanFungsional jabatanfungsional " - +"left join model.detailKategoryPegawai detailkategoripegawai " - +"left join detailkategoripegawai.kategoryPegawai kategoripegawai " - + "left join model.statusPegawai statuspegawai " - + "left join model.shiftKerja kelompokshift " - + "left join model.jenisPegawai jenispegawai " - + "left join model.ruangan ruangan " - +"where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 " - + "and jenispegawai.id = 1 " - + "order by model.namaLengkap") - List> findPegawaiByDetailKategoriDokterPsikologi(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai); - - @Query("select new Map (model.namaLengkap as namaLengkap," - +"golonganpegawai.golonganPegawai as golonganPegawai," - +"golonganpegawai.id as golonganPegawaiId," - + "pendidikan.namaPendidikan as pendidikan," - + "pendidikan.id as pendidikanId," - +"jabatanfungsional.id as jabatanId," - +"jabatanfungsional.namaJabatan as namaJabatan," - +"detailkategoripegawai.id as detailKategoriPegawaiId," - +"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," - + "model.nipPns as nipPns," - + "statuspegawai.statusPegawai as statusPegawai," - +"kategoripegawai.kategoryPegawai as kategoriPegawai," - + "model.tglMasuk as tglMasuk," - + "model.id as pegawaiId," - + "kelompokshift.id as kelompokshiftId," - + "ruangan.id as ruanganId," - + "ruangan.namaRuangan as namaRuangan," - + "model.tglLahir as tglLahir," - + "asuransiPasien.noAsuransi as noAsuransi," - + "rekanan.id as rekananId," - + "rekanan.namaRekanan as namaRekanan) " - + "from AsuransiPasien asuransiPasien " - + "left join asuransiPasien.pegawai model " - +"left join model.golonganPegawai golonganpegawai " - +"left join model.pendidikan pendidikan " - +"left join model.jabatanFungsional jabatanfungsional " - +"left join model.detailKategoryPegawai detailkategoripegawai " - +"left join detailkategoripegawai.kategoryPegawai kategoripegawai " - + "left join model.statusPegawai statuspegawai " - + "left join model.shiftKerja kelompokshift " - + "left join model.ruangan ruangan " - + "left join asuransiPasien.rekanan rekanan " - +"where rekanan.id is not null and statuspegawai.id=2 " - + "and rekanan.id = :idRekanan " + @Query("select new Map(model.id as id, " + "model.objekPajak as objekPajak) " + "from ObjekPajak model " + + "where model.id=:idObjekPajak") + Map findObjekPajakById(@Param("idObjekPajak") Integer idObjekPajak); + + @Query("select new Map(model.id as id) from Range model where namarange='Range Masa Kerja' and (rangemin<=:umur and rangemax>=:umur)") + Map findRangeId(@Param("umur") Integer umur); + + @Query("select new Map(model.id as id,model.detailKategoryPegawai as detailKategoryPegawai) from DetailKategoryPegawai model where model.id in (:ids)") + List> findDetailKategoryPegawaiBluPkwt(@Param("ids") List ids); + + @Query("select new Map(model.id as id,model.name as name) from JenisGaji model") + List> findAllJenisGaji(); + + @Query("select new Map(kelompokshift.id as kelompokShifId,kelompokshift.kelompokShiftKerja as kelompokShiftKerja," + + "shiftkerja.id as shiftKerjaId,shiftkerja.namaShift as shiftKerja," + + "komponenindex.id as komponenIndexId," + "komponenindex.komponenIndex as komponenIndex) " + + "from MapKelompokShiftToShift model " + "left join model.kelompokShift kelompokshift " + + "left join model.shiftKerja shiftkerja " + "left join shiftkerja.komponenIndex komponenindex " + + "where kelompokshift.id = :idKelompokShift") + List> findKomponenIndexByIdKelompokShift(@Param("idKelompokShift") Integer idKelompokShift); + + @Query("select new Map(sum(model.nilaiIndex) as sumNilaiIndex," + "pegawai.id as pegawaiId," + + "ruangan.id as ruaganId ) " + "from PegawaiHistoriRekapIndex model " + + "left join model.komponenIndex komponenindex " + "left join model.strukHistory strukhistory " + + "left join model.pegawai pegawai " + "left join strukhistory.ruangan ruangan " + + "where komponenindex.id in (:listKomponenIndex) and ruangan.id=:idRuangan and pegawai.id=:idPegawai " + + "and to_char(strukhistory.tglAwal,'mm-yyyy')=:periodeBulan " + "group by pegawai.id,ruangan.id") + Map getJumlahHari(@Param("listKomponenIndex") List listKomponenIndex, + @Param("idRuangan") Integer idRuangan, @Param("idPegawai") Integer idPegawai, + @Param("periodeBulan") String periodeBulan); + + @Query("select new Map(model.id as id," + "golonganpegawai.id as golonganPegawaiId," + + "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan," + + "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByGolongan model " + + "left join model.golonganPegawai golonganpegawai " + "left join model.komponenHarga komponenharga " + + "where komponenharga.id=:idKomponenHarga") + List> findGajiHarianLepas(@Param("idKomponenHarga") Integer idKomponenHarga); + + @Query("select new Map (model.namaLengkap as namaLengkap," + "golonganpegawai.golonganPegawai as golonganPegawai," + + "golonganpegawai.id as golonganPegawaiId," + "golonganPPPK.namaGolongan as golonganPPPK," + + "golonganPPPK.id as golonganPPPKId," + "pendidikan.namaPendidikan as pendidikan," + + "pendidikan.id as pendidikanId," + "jabatanfungsional.id as jabatanId," + + "jabatanfungsional.namaJabatan as namaJabatan," + "detailkategoripegawai.id as detailKategoriPegawaiId," + + "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," + "model.nipPns as nipPns," + + "statuspegawai.statusPegawai as statusPegawai," + "kategoripegawai.kategoryPegawai as kategoriPegawai," + + "model.tglMasuk as tglMasuk," + "model.id as pegawaiId," + "kelompokshift.id as kelompokshiftId," + + "ruangan.id as ruanganId," + "ruangan.namaRuangan as namaRuangan) " + "from Pegawai model " + + "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK " + + "left join model.pendidikan pendidikan " + "left join model.jabatanFungsional jabatanfungsional " + + "left join model.detailKategoryPegawai detailkategoripegawai " + + "left join detailkategoripegawai.kategoryPegawai kategoripegawai " + + "left join model.statusPegawai statuspegawai " + "left join model.shiftKerja kelompokshift " + + "left join model.jenisPegawai jenispegawai " + "left join model.ruangan ruangan " + + "where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 " + + "and jenispegawai.id = 1 " + "order by model.namaLengkap") + List> findPegawaiByDetailKategoriDokterPsikologi( + @Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); + + @Query("select new Map (model.namaLengkap as namaLengkap," + "golonganpegawai.golonganPegawai as golonganPegawai," + + "golonganpegawai.id as golonganPegawaiId," + "golonganPPPK.namaGolongan as golonganPPPK," + + "golonganPPPK.id as golonganPPPKId," + "pendidikan.namaPendidikan as pendidikan," + + "pendidikan.id as pendidikanId," + "jabatanfungsional.id as jabatanId," + + "jabatanfungsional.namaJabatan as namaJabatan," + "detailkategoripegawai.id as detailKategoriPegawaiId," + + "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," + "model.nipPns as nipPns," + + "statuspegawai.statusPegawai as statusPegawai," + "kategoripegawai.kategoryPegawai as kategoriPegawai," + + "model.tglMasuk as tglMasuk," + "model.id as pegawaiId," + "kelompokshift.id as kelompokshiftId," + + "ruangan.id as ruanganId," + "ruangan.namaRuangan as namaRuangan," + "model.tglLahir as tglLahir," + + "asuransiPasien.noAsuransi as noAsuransi," + "rekanan.id as rekananId," + + "rekanan.namaRekanan as namaRekanan) " + "from AsuransiPasien asuransiPasien " + + "left join asuransiPasien.pegawai model " + "left join model.golonganPegawai golonganpegawai " + + "left join model.golonganPPPK golonganPPPK " + "left join model.pendidikan pendidikan " + + "left join model.jabatanFungsional jabatanfungsional " + + "left join model.detailKategoryPegawai detailkategoripegawai " + + "left join detailkategoripegawai.kategoryPegawai kategoripegawai " + + "left join model.statusPegawai statuspegawai " + "left join model.shiftKerja kelompokshift " + + "left join model.ruangan ruangan " + "left join asuransiPasien.rekanan rekanan " + + "where rekanan.id is not null and statuspegawai.id=2 " + "and rekanan.id = :idRekanan " + "order by model.namaLengkap") List> findPegawaiByAsuransi(@Param("idRekanan") Integer idRekanan); - @Query("select new Map(model.totalFactorRatePremi as umr, " - +"to_char(nosk.tglBerlakuAkhir,'yyyy') as tahun ) " - +"from PegawaiSKAsuransi model " - +"left join model.noSK nosk " - +"where nosk.tglBerlakuAwal <= :periode " - +"and nosk.tglBerlakuAkhir >= :periode " - + "and model.statusEnabled=true") - public List> findUmr(@Param("periode") Date periode); + @Query("select new Map(model.totalFactorRatePremi as umr, " + "to_char(nosk.tglBerlakuAkhir,'yyyy') as tahun ) " + + "from PegawaiSKAsuransi model " + "left join model.noSK nosk " + "where nosk.tglBerlakuAwal <= :periode " + + "and nosk.tglBerlakuAkhir >= :periode " + "and model.statusEnabled=true") + public List> findUmr(@Param("periode") Date periode); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollReportingDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollReportingDao.java index 836b8fcc..956e6fa6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollReportingDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollReportingDao.java @@ -1,90 +1,63 @@ package com.jasamedika.medifirst2000.dao; -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.List; +import java.util.Map; @Repository("PayRollReportingDao") public interface PayRollReportingDao extends PagingAndSortingRepository { - - @Query("select distinct new Map(pegawai.id as pegawaiId," - + "pegawai.nipPns as nipPns, " - +"pegawai.namaLengkap as namaLengkap, " - +"detailkategoripegawai.id as detailKategoriPegawaiId, " - +"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, " - +"model.hargaSatuan as hargaSatuan, " - +"komponenharga.id as komponenHargaId, " - +"komponenharga.komponenHarga as komponenHarga, " - +"kelompokshift.id as kelompokShiftId," - +"golonganpegawai.id as golonganPegawaiId, " - +"golonganpegawai.golonganPegawai as golonganPegawai, " - +"strukhistori.tglAwal as tglAwal, " - +"strukhistori.tglAhir as tglAkhir) " - +"from PegawaiHistoriRekapGaji model " - +"left join model.komponenHarga komponenharga " - +"left join model.pegawai pegawai " - +"left join pegawai.detailKategoryPegawai detailkategoripegawai " - +"left join pegawai.golonganPegawai golonganpegawai " - +"left join model.strukHistory strukhistori " - + "left join pegawai.shiftKerja kelompokshift " - +"where komponenharga.id in (:komponenHargaId) " - + "and detailkategoripegawai.id=:detailKategoriPegawaiId " - +"and to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " - +"order by pegawai.namaLengkap") - List> reportKomponenPayroll(@Param("detailKategoriPegawaiId")Integer detailKategoriPegawaiId, - @Param("komponenHargaId")List komponenHargaId, - @Param("periode")String periode); - - @Query("select distinct new Map(pegawai.id as pegawaiId," - + "pegawai.nipPns as nipPns, " - +"pegawai.namaLengkap as namaLengkap, " - +"detailkategoripegawai.id as detailKategoriPegawaiId, " - +"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, " - +"(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, " - +"'Gaji Bersih' as komponenHarga, " - +"golonganpegawai.id as golonganPegawaiId, " - +"golonganpegawai.golonganPegawai as golonganPegawai, " - +"strukhistori.tglAwal as tglAwal, " - +"strukhistori.tglAhir as tglAkhir) " - +"from PegawaiHistoriRekap model " - +"left join model.pegawai pegawai " - +"left join pegawai.golonganPegawai golonganpegawai " - +"left join pegawai.detailKategoryPegawai detailkategoripegawai " - +"left join model.strukHistory strukhistori " - +"where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " - + "and detailkategoripegawai.id=:detailKategoriPegawaiId " - +"order by pegawai.namaLengkap") - List> reportGajiBersih(@Param("detailKategoriPegawaiId")Integer detailKategoriPegawaiId, - @Param("periode")String periode); - @Query("select distinct new Map(pegawai.id as pegawaiId," - + "pegawai.nipPns as nipPns, " - +"pegawai.namaLengkap as namaLengkap, " - +"detailkategoripegawai.id as detailKategoriPegawaiId, " - +"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, " - +"(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, " - +"'Gaji Bersih' as komponenHarga, " - +"golonganpegawai.id as golonganPegawaiId, " - +"golonganpegawai.golonganPegawai as golonganPegawai, " - +"strukhistori.tglAwal as tglAwal, " - +"strukhistori.tglAhir as tglAkhir) " - +"from PegawaiHistoriRekap model " - +"left join model.pegawai pegawai " - +"left join pegawai.golonganPegawai golonganpegawai " - +"left join pegawai.detailKategoryPegawai detailkategoripegawai " - +"left join model.strukHistory strukhistori " - +"where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " - + "and detailkategoripegawai.id=:detailKategoriPegawaiId " - + "and pegawai.id=:pegawaiId " - +"order by pegawai.namaLengkap") - List> reportGajiBersihPegawaiId(@Param("pegawaiId")Integer pegawaiId, - @Param("detailKategoriPegawaiId")Integer detailKategoriPegawaiId, - @Param("periode")String periode); + @Query("select distinct new Map(pegawai.id as pegawaiId," + "pegawai.nipPns as nipPns, " + + "pegawai.namaLengkap as namaLengkap, " + "detailkategoripegawai.id as detailKategoriPegawaiId, " + + "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, " + + "model.hargaSatuan as hargaSatuan, " + "komponenharga.id as komponenHargaId, " + + "komponenharga.komponenHarga as komponenHarga, " + "kelompokshift.id as kelompokShiftId," + + "golonganpegawai.id as golonganPegawaiId, " + "golonganpegawai.golonganPegawai as golonganPegawai, " + + "golonganPPPK.id as golonganPPPKId, " + "golonganPPPK.namaGolongan as golonganPPPK, " + + "strukhistori.tglAwal as tglAwal, " + "strukhistori.tglAhir as tglAkhir) " + + "from PegawaiHistoriRekapGaji model " + "left join model.komponenHarga komponenharga " + + "left join model.pegawai pegawai " + "left join pegawai.detailKategoryPegawai detailkategoripegawai " + + "left join pegawai.golonganPegawai golonganpegawai " + "left join pegawai.golonganPPPK golonganPPPK " + + "left join model.strukHistory strukhistori " + "left join pegawai.shiftKerja kelompokshift " + + "where komponenharga.id in (:komponenHargaId) " + "and detailkategoripegawai.id=:detailKategoriPegawaiId " + + "and to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " + "order by pegawai.namaLengkap") + List> reportKomponenPayroll(@Param("detailKategoriPegawaiId") Integer detailKategoriPegawaiId, + @Param("komponenHargaId") List komponenHargaId, @Param("periode") String periode); + + @Query("select distinct new Map(pegawai.id as pegawaiId," + "pegawai.nipPns as nipPns, " + + "pegawai.namaLengkap as namaLengkap, " + "detailkategoripegawai.id as detailKategoriPegawaiId, " + + "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, " + + "(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, " + "'Gaji Bersih' as komponenHarga, " + + "golonganpegawai.id as golonganPegawaiId, " + "golonganpegawai.golonganPegawai as golonganPegawai, " + + "golonganPPPK.id as golonganPPPKId, " + "golonganPPPK.namaGolongan as golonganPPPK, " + + "strukhistori.tglAwal as tglAwal, " + "strukhistori.tglAhir as tglAkhir) " + + "from PegawaiHistoriRekap model " + "left join model.pegawai pegawai " + + "left join pegawai.golonganPegawai golonganpegawai " + "left join pegawai.golonganPPPK golonganPPPK " + + "left join pegawai.detailKategoryPegawai detailkategoripegawai " + + "left join model.strukHistory strukhistori " + "where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " + + "and detailkategoripegawai.id=:detailKategoriPegawaiId " + "order by pegawai.namaLengkap") + List> reportGajiBersih(@Param("detailKategoriPegawaiId") Integer detailKategoriPegawaiId, + @Param("periode") String periode); + + @Query("select distinct new Map(pegawai.id as pegawaiId," + "pegawai.nipPns as nipPns, " + + "pegawai.namaLengkap as namaLengkap, " + "detailkategoripegawai.id as detailKategoriPegawaiId, " + + "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, " + + "(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, " + "'Gaji Bersih' as komponenHarga, " + + "golonganpegawai.id as golonganPegawaiId, " + "golonganpegawai.golonganPegawai as golonganPegawai, " + + "golonganPPPK.id as golonganPPPKId, " + "golonganPPPK.namaGolongan as golonganPPPK, " + + "strukhistori.tglAwal as tglAwal, " + "strukhistori.tglAhir as tglAkhir) " + + "from PegawaiHistoriRekap model " + "left join model.pegawai pegawai " + + "left join pegawai.golonganPegawai golonganpegawai " + "left join pegawai.golonganPPPK golonganPPPK " + + "left join pegawai.detailKategoryPegawai detailkategoripegawai " + + "left join model.strukHistory strukhistori " + "where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " + + "and detailkategoripegawai.id=:detailKategoriPegawaiId " + "and pegawai.id=:pegawaiId " + + "order by pegawai.namaLengkap") + List> reportGajiBersihPegawaiId(@Param("pegawaiId") Integer pegawaiId, + @Param("detailKategoriPegawaiId") Integer detailKategoriPegawaiId, @Param("periode") String periode); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java index 8f5ba451..0d9736b3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java @@ -112,12 +112,12 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "model.email as email, " + "model.emailAlternatif as emailAlternatif, " + "model.eselonId as eselonId, " + "model.gelarBelakang as gelarBelakang, " + "model.gelarDepan as gelarDepan, " + "model.golonganDarahId as golonganDarahId, " + "model.golonganPegawaiId as golonganPegawaiId, " - + "model.id as id, " + "model.idFinger as idFinger, " + "model.jabatanFungsionalId as jabatanFungsionalId, " - + "mapPeg.jabatanId as jabatanInternalId, " + "model.jabatanLamarId as jabatanLamarId, " - + "model.jabatanStrukturalId as jabatanStrukturalId, " + "model.jenisKelaminId as jenisKelaminId, " - + "model.jenisPegawaiId as jenisPegawaiId, " + "model.jenisPegawaiLamarId as jenisPegawaiLamarId, " - + "model.kategoryPegawaiId as kategoryPegawaiId, " + "model.kdProfile as kdProfile, " - + "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, " + + "model.golonganPPPKId as golonganPPPKId, " + "model.id as id, " + "model.idFinger as idFinger, " + + "model.jabatanFungsionalId as jabatanFungsionalId, " + "mapPeg.jabatanId as jabatanInternalId, " + + "model.jabatanLamarId as jabatanLamarId, " + "model.jabatanStrukturalId as jabatanStrukturalId, " + + "model.jenisKelaminId as jenisKelaminId, " + "model.jenisPegawaiId as jenisPegawaiId, " + + "model.jenisPegawaiLamarId as jenisPegawaiLamarId, " + "model.kategoryPegawaiId as kategoryPegawaiId, " + + "model.kdProfile as kdProfile, " + "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, " + "model.kodeExternal as kodeExternal, " + "model.kodeGapokId as kodeGapokId, " + "model.kodePos as kodePos," + "model.kualifikasiJurusanId as kualifikasiJurusanId, " + "model.nama as nama, " + "model.namaExternal as namaExternal, " + "model.namaKeluarga as namaKeluarga, " @@ -162,12 +162,12 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "model.email as email, " + "model.emailAlternatif as emailAlternatif, " + "model.eselonId as eselonId, " + "model.gelarBelakang as gelarBelakang, " + "model.gelarDepan as gelarDepan, " + "model.golonganDarahId as golonganDarahId, " + "model.golonganPegawaiId as golonganPegawaiId, " - + "model.id as id, " + "model.idFinger as idFinger, " + "model.jabatanFungsionalId as jabatanFungsionalId, " - + "mapPegawai.jabatanId as jabatanInternalId, " + "model.jabatanLamarId as jabatanLamarId, " - + "model.jabatanStrukturalId as jabatanStrukturalId, " + "model.jenisKelaminId as jenisKelaminId, " - + "model.jenisPegawaiId as jenisPegawaiId, " + "model.jenisPegawaiLamarId as jenisPegawaiLamarId, " - + "model.kategoryPegawaiId as kategoryPegawaiId, " + "model.kdProfile as kdProfile, " - + "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, " + + "model.golonganPPPKId as golonganPPPKId, " + "model.id as id, " + "model.idFinger as idFinger, " + + "model.jabatanFungsionalId as jabatanFungsionalId, " + "mapPegawai.jabatanId as jabatanInternalId, " + + "model.jabatanLamarId as jabatanLamarId, " + "model.jabatanStrukturalId as jabatanStrukturalId, " + + "model.jenisKelaminId as jenisKelaminId, " + "model.jenisPegawaiId as jenisPegawaiId, " + + "model.jenisPegawaiLamarId as jenisPegawaiLamarId, " + "model.kategoryPegawaiId as kategoryPegawaiId, " + + "model.kdProfile as kdProfile, " + "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, " + "model.kodeExternal as kodeExternal, " + "model.kodeGapokId as kodeGapokId, " + "model.kodePos as kodePos," + "model.kualifikasiJurusanId as kualifikasiJurusanId, " + "model.nama as nama, " + "model.namaExternal as namaExternal, " + "model.namaKeluarga as namaKeluarga, " @@ -302,7 +302,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.tglTerbitStr as tglTerbitStr, " + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan, " + " pegawai.gelarBelakang as gelarBelakang, " + " pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan, " - + "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + "golonganPPPK.namaGolongan as golonganPPPK, " + "agama.agama as agama, " + + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, " + "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, " + "jabatanLamar.namaJabatan as jabatanLamar, " + "jabatanStruktural.namaJabatan as jabatanStruktural, " @@ -321,6 +322,7 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + "suku.suku as suku, " + "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai) " + "from Pegawai pegawai " + "left join pegawai.golonganPegawai golongan " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.agama agama " + "left join pegawai.detailKelompokJabatan kelompokJabatan " + "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah " @@ -359,8 +361,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.isStrSeumurHidup as isStrSeumurHidup," + "pegawai.gelarDepan as gelarDepan," + "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir," - + "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama," - + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + + "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK," + + "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon," + "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah," + "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar," @@ -394,7 +396,7 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join pegawai.kualifikasiJurusan kualifikasiJurusan " + "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara " + "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan " - + "left join pegawai.pendidikan pendidikan " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan " + "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak " + "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja " + "left join pegawai.rekanan rekanan " + "left join pegawai.shiftKerja shiftKerja " @@ -436,7 +438,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + " pegawai.kodePos as kodePos, " + " pegawai.nilaiJabatan as nilaiJabatan, " + " pegawai.grade as grade, " + "pegawai.gelarDepan as gelarDepan, " + " pegawai.gelarBelakang as gelarBelakang, " + " pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan, " - + "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + "golonganPPPK.namaGolongan as golonganPPPK, " + "agama.agama as agama, " + + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, " + "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, " + "jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal," @@ -460,6 +463,7 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "left join pegawai.golonganPegawai golongan " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.agama agama " + "left join pegawai.detailKelompokJabatan kelompokJabatan " + "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah " @@ -495,9 +499,10 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific @Param("tahun") String tahun); String strQryJabatanCetak = "select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, " - + "golongan.id as idGolongan,golongan.golonganPegawai as namaGolongan, " + "pegawai.noTlp as noTlp, " - + "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, " + "pegawai.alamat as alamat, " - + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + "golongan.id as idGolongan,golongan.golonganPegawai as namaGolongan, " + + "golonganPPPK.id as idGolonganPPPK,golonganPPPK.namaGolongan as golonganPPPK, " + + "pegawai.noTlp as noTlp, " + "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, " + + "pegawai.alamat as alamat, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, " + "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, " + "jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal," @@ -520,9 +525,9 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "departemen.namaDepartemen as departemen, " + "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai) " + "from MapPegawaiJabatanToUnitKerja mappegawai " + "left join mappegawai.pegawai pegawai " + "left join pegawai.golonganPegawai golongan " - + "left join pegawai.agama agama " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " - + "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon " - + "left join pegawai.golonganDarah golonganDarah " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.agama agama " + + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.dokumen dokumen " + + "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah " + "left join pegawai.jabatanFungsional jabatanFungsional " + "left join mappegawai.jabatan jabatanInternal " + "left join pegawai.jabatanLamar jabatanLamar " + "left join pegawai.jabatanStruktural jabatanStruktural " + "left join pegawai.jenisKelamin jenisKelamin " + "left join pegawai.jenisPegawai jenisPegawai " @@ -567,8 +572,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific List findAllPegawaiAktifByRuangan(@Param("idRuangan") Integer idRuangan); @Query("select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, " - + "golongan.golonganPegawai as namaGolongan, " + "agama.agama as agama, " - + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + "golongan.golonganPegawai as namaGolongan, " + "golonganPPPK.namaGolongan as golonganPPPK, " + + "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, " + "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, " + "jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal," @@ -588,9 +593,10 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + "suku.suku as suku, " + "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai " - + "left join pegawai.golonganPegawai golongan " + "left join pegawai.agama agama " - + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.dokumen dokumen " - + "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah " + + "left join pegawai.golonganPegawai golongan " + "left join pegawai.golonganPPPK golonganPPPK " + + "left join pegawai.agama agama " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + + "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon " + + "left join pegawai.golonganDarah golonganDarah " + "left join pegawai.jabatanFungsional jabatanFungsional " + "left join mapPegawai.jabatan jabatanInternal " + "left join pegawai.jabatanLamar jabatanLamar " + "left join pegawai.jabatanStruktural jabatanStruktural " + "left join pegawai.jenisKelamin jenisKelamin " + "left join pegawai.jenisPegawai jenisPegawai " @@ -612,9 +618,10 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific Pegawai findPegawaiHukorById(@Param("idPegawai") Integer idPegawai); @Query("select NEW Map(p.id as idPegawai, p.namaLengkap as namaLengkap, p.tglMasuk as tglMasuk, p.alamat as alamat ,jabatanInternal.namaJabatan as namaJabatan , " - + "golonganPegawai.golonganPegawai as grade) " + " from MapPegawaiJabatanToUnitKerja mapPegawai " - + "left join mapPegawai.pegawai p " + "left join mapPegawai.jabatan jabatanInternal " - + "left join p.golonganPegawai as golonganPegawai " + "where mapPegawai.isPrimary is true " + + "golonganPegawai.golonganPegawai as grade," + "golonganPPPK.namaGolongan as golonganPPPK) " + + " from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p " + + "left join mapPegawai.jabatan jabatanInternal " + "left join p.golonganPegawai as golonganPegawai " + + "left join p.golonganPPPK as golonganPPPK " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.id = :idPegawai") Map findPegawaiForMobileById(@Param("idPegawai") Integer idPegawai); @@ -712,7 +719,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.namaLengkap as namaLengkap, " + " pegawai.tglLahir as tglLahir, " + "pegawai.gelarDepan as gelarDepan, " + " pegawai.gelarBelakang as gelarBelakang, " + " pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan, " - + "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + "golonganPPPK.namaGolongan as golonganPPPK, " + "agama.agama as agama, " + + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, " + "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, " + "jabatanLamar.namaJabatan as jabatanLamar, " + "jabatanStruktural.namaJabatan as jabatanStruktural, " @@ -731,9 +739,10 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + "suku.suku as suku, " + "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai," + "pegawai.statusEnabled as statusEnabled) " + "from Pegawai pegawai " - + "left join pegawai.golonganPegawai golongan " + "left join pegawai.agama agama " - + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.dokumen dokumen " - + "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah " + + "left join pegawai.golonganPegawai golongan " + "left join pegawai.golonganPPPK golonganPPPK " + + "left join pegawai.agama agama " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + + "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon " + + "left join pegawai.golonganDarah golonganDarah " + "left join pegawai.jabatanFungsional jabatanFungsional " + "left join pegawai.jabatanLamar jabatanLamar " + "left join pegawai.jabatanStruktural jabatanStruktural " + "left join pegawai.jenisKelamin jenisKelamin " + "left join pegawai.jenisPegawai jenisPegawai " + "left join pegawai.jenisPegawaiLamar jenisPegawaiLamar " @@ -859,7 +868,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.noBPJS as noBPJS, " + "pegawai.noHandphone as noHandphone, " + "pegawai.noIdentitas as noIdentitas, " + "pegawai.noSip as noSip, " + "pegawai.noStr as noStr, " + "pegawai.noTlp as noTlp, " + "pegawai.npwp as npwp, " + "pegawai.negaraId as negaraId, " - + "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, " + "pegawai.ruanganId as ruanganId, " + + "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, " + + "pegawai.golonganPPPKId as golonganPPPKId, " + "pegawai.ruanganId as ruanganId, " + "pegawai.rekananId as rekananId," + "pegawai.statusRhesus as statusRhesus, " + "pegawai.shiftKerjaId as shiftKerjaId, " + "pegawai.statusKawinId as statusKawinId, " + "pegawai.sukuId as sukuId, " + "pegawai.tempatLahir as tempatLahir, " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKGajiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKGajiDao.java index fe6ea949..9888f734 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKGajiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKGajiDao.java @@ -1,196 +1,133 @@ package com.jasamedika.medifirst2000.dao; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.entities.PegawaiSKGaji; 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.PegawaiSKGaji; +import java.util.List; +import java.util.Map; @Repository("PegawaiSKGajiDao") public interface PegawaiSKGajiDao extends PagingAndSortingRepository { - // NIP PNS, Nama Lengkap, Golongan, Pendidikan, Masa Kerja, (Jabatan), Komponen Gaji, Harga - @Query("select new Map(p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, " + // NIP PNS, Nama Lengkap, Golongan, Pendidikan, Masa Kerja, (Jabatan), + // Komponen Gaji, Harga + @Query("select new Map(p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.golonganPegawai AS Golongan, gp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, " + "jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gj.hargaSatuan AS Harga) " - + "from PegawaiSKGaji gj " - + "left join gj.pegawai p " - + "left join p.detailKategoryPegawai dkp " - + "left join p.golonganPegawai g " - + "left join p.pendidikan pdk " - + "left join p.jabatanFungsional jf " - + "left join gj.komponenHarga kh " + + "from PegawaiSKGaji gj " + "left join gj.pegawai p " + "left join p.detailKategoryPegawai dkp " + + "left join p.golonganPegawai g " + "left join p.golonganPPPK gp " + "left join p.pendidikan pdk " + + "left join p.jabatanFungsional jf " + "left join gj.komponenHarga kh " + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " + "and kh.komponenHarga in(45, 52, 56, 57) ") - List> findPegawaiGajiSKByKategoriPegawai(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - + List> findPegawaiGajiSKByKategoriPegawai( + @Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); + // Gaji Pokok (ID=45) - @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, " + @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, " + "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjmkp.hargaSatuan AS Harga) " - + "from PegawaiSKGaji gj, GajiPerMasaKerjaPendidikan gjmkp " - + "left join gj.pegawai p " - + "left join p.detailKategoryPegawai dkp " - + "left join p.golonganPegawai gp " - + "left join p.pendidikan pdk " - + "left join p.jabatanFungsional jf " - + "left join gj.komponenHarga kh " - + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " - + "and gj.komponenHarga.komponenHarga='Gaji Pokok' " - + "and gjmkp.pendidikan=p.pendidikan " + + "from PegawaiSKGaji gj, GajiPerMasaKerjaPendidikan gjmkp " + "left join gj.pegawai p " + + "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp " + + "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf " + + "left join gj.komponenHarga kh " + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " + + "and gj.komponenHarga.komponenHarga='Gaji Pokok' " + "and gjmkp.pendidikan=p.pendidikan " + "and gjmkp.range = (select r.id from Range r where r.namaRange='Range Masa Kerja' and EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) between r.rangeMin and r.rangeMax) " + "order by NIP") List> findGajiPokokPegawai(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - + // Tunjangan Fungsional (ID=52) - @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, " + @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, " + "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjjp.hargaSatuan AS Harga) " - + "from PegawaiSKGaji gj, GajiPerJabatanPendidikan gjjp " - + "left join gj.pegawai p " - + "left join p.detailKategoryPegawai dkp " - + "left join p.golonganPegawai gp " - + "left join p.pendidikan pdk " - + "left join p.jabatanFungsional jf " - + "left join gj.komponenHarga kh " - + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " - + "and gj.komponenHarga.komponenHarga='Tunjangan Fungsional' " - + "and gjjp.jabatan=p.jabatanFungsional " - + "and gjjp.pendidikan=p.pendidikan " - + "order by NIP") - List> findTunjanganFungsional(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - + + "from PegawaiSKGaji gj, GajiPerJabatanPendidikan gjjp " + "left join gj.pegawai p " + + "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp " + + "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf " + + "left join gj.komponenHarga kh " + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " + + "and gj.komponenHarga.komponenHarga='Tunjangan Fungsional' " + "and gjjp.jabatan=p.jabatanFungsional " + + "and gjjp.pendidikan=p.pendidikan " + "order by NIP") + List> findTunjanganFungsional( + @Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); + // Tunjangan Bahaya Radiasi (ID=56) - @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, " + @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, " + "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjlt.hargaSatuan AS Harga) " + "from PegawaiSKGaji gj, GajiPerLevelTingkat gjlt, MapPegawaiJabatanToUnitKerja mapPegawai " - + "left join gj.pegawai p " - + "left join p.detailKategoryPegawai dkp " - + "left join p.golonganPegawai gp " - + "left join p.pendidikan pdk " - + "left join p.jabatanFungsional jf " - + "left join gj.komponenHarga kh " - + "where mapPegawai.pegawaiId = p.id " - + "and mapPegawai.isPrimary is true " - + "and mapPegawai.statusEnabled is true " + + "left join gj.pegawai p " + "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp " + + "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf " + + "left join gj.komponenHarga kh " + "where mapPegawai.pegawaiId = p.id " + + "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and dkp.detailKategoryPegawai.id = :idDetailKategoriPegawai " + "and gj.komponenHarga.komponenHarga = 'Tunjangan Bahaya Radiasi' " - + "and gjlt.jabatan = mapPegawai.jabatan " - + "and gjlt.levelTingkat = p.levelTingkat " - + "order by NIP") - List> findTunjanganBahayaRadiasi(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - + + "and gjlt.jabatan = mapPegawai.jabatan " + "and gjlt.levelTingkat = p.levelTingkat " + "order by NIP") + List> findTunjanganBahayaRadiasi( + @Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); + // Tunjangan Layanan (ID=57) - @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, " + @Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, " + "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjj.hargaSatuan AS Harga) " + "from PegawaiSKGaji gj, GajiPerJabatan gjj, MapPegawaiJabatanToUnitKerja mapPegawai " - + "left join gj.pegawai p " - + "left join p.detailKategoryPegawai dkp " - + "left join p.golonganPegawai gp " - + "left join p.pendidikan pdk " - + "left join p.jabatanFungsional jf " - + "left join gj.komponenHarga kh " - + "where mapPegawai.pegawaiId = p.id " - + "and mapPegawai.isPrimary is true " - + "and mapPegawai.statusEnabled is true " + + "left join gj.pegawai p " + "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp " + + "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf " + + "left join gj.komponenHarga kh " + "where mapPegawai.pegawaiId = p.id " + + "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and dkp.detailKategoryPegawai.id = :idDetailKategoriPegawai " - + "and gj.komponenHarga.komponenHarga = 'Tunjangan Layanan' " - + "and gjj.jabatan = mapPegawai.jabatan ") + + "and gj.komponenHarga.komponenHarga = 'Tunjangan Layanan' " + "and gjj.jabatan = mapPegawai.jabatan ") List> findTunjanganLayanan(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - - - //@Query("select v from komponen_gaji_kotor_v v") - //List> findGajiKotor(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - - //@Query("select v from komponen_gaji_bersih_v v") - //List> findGajiBersih(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - - @Query("select new Map(model.id as pegawaiSkGajiId, " - +"suratkeputusan.id as suratKeputusanId, " - +"suratkeputusan.noSK as noSuratKeputusan, " - +"suratkeputusan.namaSK as namaSuratKeputusan, " - +"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " - +"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " - +"ruangan.id as ruanganId, " - +"ruangan.namaRuangan as namaRuangan, " - +"pegawai.id as pegawaiId, " - +"pegawai.namaLengkap as namaPegawai, " - +"komponenharga.id as komponenHargaId, " - +"komponenharga.komponenHarga as namaKomponenHarga, " - +"model.persenHargaSatuan as persenHargaSatuan, " - +"model.hargaSatuan as hargaSatuan, " - +"model.factorRate as factorRate, " - +"model.operatorFactorRate as operatorFactorRate, " - +"model.isByMonth as isByMonth, " - +"model.isByYear as isByYear, " - +"model.isByWeek as isByWeek, " - +"model.isByDay as isByDay," - +"model.statusEnabled as statusEnabled " - + ") " - +"from PegawaiSKGaji model " - +"left join model.noSK suratkeputusan " - +"left join suratkeputusan.ruangan ruangan " - +"left join model.pegawai pegawai " - +"left join model.komponenHarga komponenharga " - + "where model.id =:idPegawaiSkGaji") - Map get(@Param("idPegawaiSkGaji") Integer idPegawaiSkGaji); - - @Query("select new Map(model.id as pegawaiSkGajiId, " - +"suratkeputusan.id as suratKeputusanId, " - +"suratkeputusan.noSK as noSuratKeputusan, " - +"suratkeputusan.namaSK as namaSuratKeputusan, " - +"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " - +"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " - +"ruangan.id as ruanganId, " - +"ruangan.namaRuangan as namaRuangan, " - +"pegawai.id as pegawaiId, " - +"pegawai.namaLengkap as namaPegawai, " - +"komponenharga.id as komponenHargaId, " - +"komponenharga.komponenHarga as namaKomponenHarga, " - +"model.persenHargaSatuan as persenHargaSatuan, " - +"model.hargaSatuan as hargaSatuan, " - +"model.factorRate as factorRate, " - +"model.operatorFactorRate as operatorFactorRate, " - +"model.isByMonth as isByMonth, " - +"model.isByYear as isByYear, " - +"model.isByWeek as isByWeek, " - +"model.isByDay as isByDay," - +"model.statusEnabled as statusEnabled " - + ") " - +"from PegawaiSKGaji model " - +"left join model.noSK suratkeputusan " - +"left join suratkeputusan.ruangan ruangan " - +"left join model.pegawai pegawai " - +"left join model.komponenHarga komponenharga " - + "where pegawai.id =:idPegawai") - List> getByPegawaiId(@Param("idPegawai") Integer idPegawai); - @Query("select new Map(model.id as pegawaiSkGajiId, " - +"suratkeputusan.id as suratKeputusanId, " - +"suratkeputusan.noSK as noSuratKeputusan, " - +"suratkeputusan.namaSK as namaSuratKeputusan, " - +"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " - +"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " - +"ruangan.id as ruanganId, " - +"ruangan.namaRuangan as namaRuangan, " - +"pegawai.id as pegawaiId, " - +"pegawai.namaLengkap as namaPegawai, " - +"komponenharga.id as komponenHargaId, " - +"komponenharga.komponenHarga as namaKomponenHarga, " - +"model.persenHargaSatuan as persenHargaSatuan, " - +"model.hargaSatuan as hargaSatuan, " - +"model.factorRate as factorRate, " - +"model.operatorFactorRate as operatorFactorRate, " - +"model.isByMonth as isByMonth, " - +"model.isByYear as isByYear, " - +"model.isByWeek as isByWeek, " - +"model.isByDay as isByDay ) " - +"from PegawaiSKGaji model " - +"left join model.noSK suratkeputusan " - +"left join suratkeputusan.ruangan ruangan " - +"left join model.pegawai pegawai " - +"left join model.komponenHarga komponenharga") - List> getAll(); + // @Query("select v from komponen_gaji_kotor_v v") + // List> findGajiKotor(@Param("idDetailKategoriPegawai") + // Integer idDetailKategoriPegawai); + + // @Query("select v from komponen_gaji_bersih_v v") + // List> + // findGajiBersih(@Param("idDetailKategoriPegawai") Integer + // idDetailKategoriPegawai); + + @Query("select new Map(model.id as pegawaiSkGajiId, " + "suratkeputusan.id as suratKeputusanId, " + + "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, " + + "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " + + "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, " + + "ruangan.namaRuangan as namaRuangan, " + "pegawai.id as pegawaiId, " + + "pegawai.namaLengkap as namaPegawai, " + "komponenharga.id as komponenHargaId, " + + "komponenharga.komponenHarga as namaKomponenHarga, " + "model.persenHargaSatuan as persenHargaSatuan, " + + "model.hargaSatuan as hargaSatuan, " + "model.factorRate as factorRate, " + + "model.operatorFactorRate as operatorFactorRate, " + "model.isByMonth as isByMonth, " + + "model.isByYear as isByYear, " + "model.isByWeek as isByWeek, " + "model.isByDay as isByDay," + + "model.statusEnabled as statusEnabled " + ") " + "from PegawaiSKGaji model " + + "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan " + + "left join model.pegawai pegawai " + "left join model.komponenHarga komponenharga " + + "where model.id =:idPegawaiSkGaji") + Map get(@Param("idPegawaiSkGaji") Integer idPegawaiSkGaji); + + @Query("select new Map(model.id as pegawaiSkGajiId, " + "suratkeputusan.id as suratKeputusanId, " + + "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, " + + "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " + + "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, " + + "ruangan.namaRuangan as namaRuangan, " + "pegawai.id as pegawaiId, " + + "pegawai.namaLengkap as namaPegawai, " + "komponenharga.id as komponenHargaId, " + + "komponenharga.komponenHarga as namaKomponenHarga, " + "model.persenHargaSatuan as persenHargaSatuan, " + + "model.hargaSatuan as hargaSatuan, " + "model.factorRate as factorRate, " + + "model.operatorFactorRate as operatorFactorRate, " + "model.isByMonth as isByMonth, " + + "model.isByYear as isByYear, " + "model.isByWeek as isByWeek, " + "model.isByDay as isByDay," + + "model.statusEnabled as statusEnabled " + ") " + "from PegawaiSKGaji model " + + "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan " + + "left join model.pegawai pegawai " + "left join model.komponenHarga komponenharga " + + "where pegawai.id =:idPegawai") + List> getByPegawaiId(@Param("idPegawai") Integer idPegawai); + + @Query("select new Map(model.id as pegawaiSkGajiId, " + "suratkeputusan.id as suratKeputusanId, " + + "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, " + + "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " + + "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, " + + "ruangan.namaRuangan as namaRuangan, " + "pegawai.id as pegawaiId, " + + "pegawai.namaLengkap as namaPegawai, " + "komponenharga.id as komponenHargaId, " + + "komponenharga.komponenHarga as namaKomponenHarga, " + "model.persenHargaSatuan as persenHargaSatuan, " + + "model.hargaSatuan as hargaSatuan, " + "model.factorRate as factorRate, " + + "model.operatorFactorRate as operatorFactorRate, " + "model.isByMonth as isByMonth, " + + "model.isByYear as isByYear, " + "model.isByWeek as isByWeek, " + "model.isByDay as isByDay ) " + + "from PegawaiSKGaji model " + "left join model.noSK suratkeputusan " + + "left join suratkeputusan.ruangan ruangan " + "left join model.pegawai pegawai " + + "left join model.komponenHarga komponenharga") + List> getAll(); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKPajakDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKPajakDao.java index e97079d8..e6c86a4e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKPajakDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKPajakDao.java @@ -1,78 +1,60 @@ package com.jasamedika.medifirst2000.dao; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.entities.PegawaiSKPajak; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.jasamedika.medifirst2000.entities.PegawaiSKPajak; +import java.util.List; +import java.util.Map; @Repository("PegawaiSKPajakDao") public interface PegawaiSKPajakDao extends CrudRepository { // Potongan Pajak (ID=42) /* - @Query("select new Map(pj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.name AS Golongan, pdk.namaPendidikan AS Pendidikan, " - + "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, 'PotonganPajak' AS KomponenHarga, pj.persenPajak AS Harga) " - + "from PegawaiSKPajak pj " - + "left join pj.pegawai p " - + "left join p.detailKategoryPegawai dkp " - + "left join p.Golongan g " - + "left join p.pendidikan pdk " - + "left join p.jabatanFungsional jf " - + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " - + "and pj.golonganPegawai and p.golonganPegawai") - List> findPotonganPajak(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai); - */ + * @Query("select new Map(pj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.name AS Golongan, pdk.namaPendidikan AS Pendidikan, " + * + + * "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, 'PotonganPajak' AS KomponenHarga, pj.persenPajak AS Harga) " + * + "from PegawaiSKPajak pj " + "left join pj.pegawai p " + + * "left join p.detailKategoryPegawai dkp " + "left join p.Golongan g " + + * "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf " + + * "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " + + * "and pj.golonganPegawai and p.golonganPegawai") List> + * findPotonganPajak(@Param("idDetailKategoriPegawai") Integer + * idDetailKategoriPegawai); + */ - @Query("select new Map(model.id as pegawaiSkPajakId, " - +"suratkeputusan.id as suratKeputusanId, " - +"suratkeputusan.noSK as noSuratKeputusan, " - +"suratkeputusan.namaSK as namaSuratKeputusan, " - +"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " - +"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " - +"ruangan.id as ruanganId, " - +"ruangan.namaRuangan as namaRuangan, " - +"golonganpegawai.id as golonganPegawaiId, " - +"golonganpegawai.golonganPegawai as golonganPegawai, " - +"objekpajak.id as objekpajakId, " - +"objekpajak.objekPajak as objekPajak, " - +"model.persenPajak as persenPajak, " - +"model.statusEnabled as statusEnabled " - +") from PegawaiSKPajak model " - +"left join model.noSK suratkeputusan " - +"left join suratkeputusan.ruangan ruangan " - +"left join model.golonganPegawai golonganpegawai " - +"left join model.objekPajak objekpajak " - +"left join model.range range " + @Query("select new Map(model.id as pegawaiSkPajakId, " + "suratkeputusan.id as suratKeputusanId, " + + "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, " + + "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, " + + "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, " + + "ruangan.namaRuangan as namaRuangan, " + "golonganpegawai.id as golonganPegawaiId, " + + "golonganpegawai.golonganPegawai as golonganPegawai, " + "golonganPPPK.id as golonganPPPKId, " + + "golonganPPPK.namaGolongan as golonganPPPK, " + "objekpajak.id as objekpajakId, " + + "objekpajak.objekPajak as objekPajak, " + "model.persenPajak as persenPajak, " + + "model.statusEnabled as statusEnabled " + ") from PegawaiSKPajak model " + + "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan " + + "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK " + + "left join model.objekPajak objekpajak " + "left join model.range range " + "where model.id =:idPegawaiSkPajak") - Map get(@Param("idPegawaiSkPajak") Integer idPegawaiSkPajak); - - @Query("select new Map(model.id as pegawaiSkPajakId, " - +"suratkeputusan.id as suratKeputusanId, " - +"suratkeputusan.noSK as noSuratKeputusan, " - +"suratkeputusan.namaSK as namaSuratKeputusan, " - +"to_char(suratkeputusan.tglBerlakuAwal,'dd-MM-yyyy') as tglBerlakuAwal, " - +"to_char(suratkeputusan.tglBerlakuAkhir,'dd-MM-yyyy') as tglBerlakuAkhir, " - +"ruangan.id as ruanganId, " - +"ruangan.namaRuangan as namaRuangan, " - +"golonganpegawai.id as golonganPegawaiId, " - +"golonganpegawai.golonganPegawai as golonganPegawai, " - +"objekpajak.id as objekpajakId, " - +"objekpajak.objekPajak as objekPajak, " - +"model.persenPajak as persenPajak," - + "model.statusEnabled as statusEnabled " - +") from PegawaiSKPajak model " - +"left join model.noSK suratkeputusan " - +"left join suratkeputusan.ruangan ruangan " - +"left join model.golonganPegawai golonganpegawai " - +"left join model.objekPajak objekpajak " - +"left join model.range range") - List> getAll(); - + Map get(@Param("idPegawaiSkPajak") Integer idPegawaiSkPajak); + + @Query("select new Map(model.id as pegawaiSkPajakId, " + "suratkeputusan.id as suratKeputusanId, " + + "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, " + + "to_char(suratkeputusan.tglBerlakuAwal,'dd-MM-yyyy') as tglBerlakuAwal, " + + "to_char(suratkeputusan.tglBerlakuAkhir,'dd-MM-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, " + + "ruangan.namaRuangan as namaRuangan, " + "golonganpegawai.id as golonganPegawaiId, " + + "golonganpegawai.golonganPegawai as golonganPegawai, " + "golonganPPPK.id as golonganPPPKId, " + + "golonganPPPK.namaGolongan as golonganPPPK, " + "objekpajak.id as objekpajakId, " + + "objekpajak.objekPajak as objekPajak, " + "model.persenPajak as persenPajak," + + "model.statusEnabled as statusEnabled " + ") from PegawaiSKPajak model " + + "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan " + + "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK " + + "left join model.objekPajak objekpajak " + "left join model.range range") + List> getAll(); + @Query("select model from PegawaiSKPajak model where model.golonganPegawaiId =:golonganId ") PegawaiSKPajak findPersenPajakByGolongan(@Param("golonganId") Integer golonganId); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiMuSaReDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiMuSaReDao.java index aaa4d05f..7b3a3d32 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiMuSaReDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiMuSaReDao.java @@ -1,285 +1,135 @@ package com.jasamedika.medifirst2000.dao; -import java.util.Date; -import java.util.List; -import java.util.Map; +import com.jasamedika.medifirst2000.entities.PlanningPegawaiMuSaRe; 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.PlanningPegawaiMuSaRe; + +import java.util.Date; +import java.util.List; +import java.util.Map; @Repository("PlanningPegawaiMuSaReDao") -public interface PlanningPegawaiMuSaReDao extends PagingAndSortingRepository{ - - @Query("select " - + "a.noPlanning " - + "from PlanningPegawaiMuSaRe a " - + "where a.noPlanning LIKE %:kode% ") +public interface PlanningPegawaiMuSaReDao extends PagingAndSortingRepository { + + @Query("select " + "a.noPlanning " + "from PlanningPegawaiMuSaRe a " + "where a.noPlanning LIKE %:kode% ") List noUsulan(@Param("kode") String kode); - - @Query("select count(a.noPlanning) " - + "from PlanningPegawaiMuSaRe a " - + "where a.noPlanning LIKE %:kode% ") + + @Query("select count(a.noPlanning) " + "from PlanningPegawaiMuSaRe a " + "where a.noPlanning LIKE %:kode% ") Long countNoUsulan(@Param("kode") String kode); - - @Query("select count(a.noplanning) " - + "from StrukPlanning a ") + + @Query("select count(a.noplanning) " + "from StrukPlanning a ") Long countNoStruk(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.namaLengkap as namaLengkap) " - + "from Pegawai a " - + "left join a.ruangan b " - + "left join a.kategoryPegawai c " - + "left join a.statusPegawai d " + + @Query("select NEW Map (" + "a.id as id, " + "a.namaLengkap as namaLengkap) " + "from Pegawai a " + + "left join a.ruangan b " + "left join a.kategoryPegawai c " + "left join a.statusPegawai d " + "where b.id=:id and c.id!=11 and d.id=2") - List> getListPegawai( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.namaLengkap as namaLengkap) " - + "from Pegawai a " + List> getListPegawai(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.id as id, " + "a.namaLengkap as namaLengkap) " + "from Pegawai a " + "left join a.ruangan b ") List> getListPegawai(); - - @Query("select NEW Map (" - + "a.namaLengkap as namaLengkap) " - + "from Pegawai a where a.id=:id") - Map getPegawai( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.namaJabatan as namaJabatan) " - + "from Jabatan a " - + "left join a.jenisJabatan b " - + "where b.id=:id") - List> getListJabatanByJenis( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.namaRuangan as namaRuangan) " - + "from Ruangan a") + + @Query("select NEW Map (" + "a.namaLengkap as namaLengkap) " + "from Pegawai a where a.id=:id") + Map getPegawai(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.id as id, " + "a.namaJabatan as namaJabatan) " + "from Jabatan a " + + "left join a.jenisJabatan b " + "where b.id=:id") + List> getListJabatanByJenis(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.id as id, " + "a.namaRuangan as namaRuangan) " + "from Ruangan a") List> getListRuanganMutasi(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.eselon as eselon) " - + "from Eselon a") + + @Query("select NEW Map (" + "a.id as id, " + "a.eselon as eselon) " + "from Eselon a") List> getListEselon(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.golonganPegawai as namaPangkat) " - + "from GolonganPegawai a") + + @Query("select NEW Map (" + "a.id as id, " + "a.golonganPegawai as namaPangkat) " + "from GolonganPegawai a") List> getListGolongan(); - - @Query("select NEW Map (" - + "b.id as jabatanFungsionalId, " - + "b.namaJabatan as jabatanFungsional, " - + "c.id as jabatanInternalId, " - + "c.namaJabatan as jabatanInternal, " - + "d.id as ruanganId, " - + "d.namaRuangan as namaRuangan, " - + "e.id as eselonId, " - + "e.eselon as eselon, " - + "f.id as pangkatId, " - + "f.golonganPegawai as namaPangkat) " - + "from MapPegawaiJabatanToUnitKerja m " - + "left join m.pegawai a " - + "left join a.jabatanFungsional b " - + "left join m.jabatan c " - + "left join a.ruangan d " - + "left join a.eselon e " - + "left join a.golonganPegawai f " - + "where m.isPrimary is true " - + "and m.statusEnabled is true " - + "and a.id=:id") - Map getDataMuSaReByPegawai( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.jenisHukuman as jenisHukuman) " - + "from JenisHukuman a") + + @Query("select NEW Map (" + "b.id as jabatanFungsionalId, " + "b.namaJabatan as jabatanFungsional, " + + "c.id as jabatanInternalId, " + "c.namaJabatan as jabatanInternal, " + "d.id as ruanganId, " + + "d.namaRuangan as namaRuangan, " + "e.id as eselonId, " + "e.eselon as eselon, " + "f.id as pangkatId, " + + "f.golonganPegawai as namaPangkat, " + "g.id as golonganPPPKId, " + "g.namaGolongan as golonganPPPK) " + + "from MapPegawaiJabatanToUnitKerja m " + "left join m.pegawai a " + "left join a.jabatanFungsional b " + + "left join m.jabatan c " + "left join a.ruangan d " + "left join a.eselon e " + + "left join a.golonganPegawai f " + "left join a.golonganPPPK g " + "where m.isPrimary is true " + + "and m.statusEnabled is true " + "and a.id=:id") + Map getDataMuSaReByPegawai(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.id as id, " + "a.jenisHukuman as jenisHukuman) " + "from JenisHukuman a") List> getJenisHukuman(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.name as suratKeputusan) " - + "from JenisSuratKeputusan a ") + + @Query("select NEW Map (" + "a.id as id, " + "a.name as suratKeputusan) " + "from JenisSuratKeputusan a ") List> listJenisSuratKeputusan(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.statusPegawai as statusPegawai) " - + "from StatusPegawai a") + + @Query("select NEW Map (" + "a.id as id, " + "a.statusPegawai as statusPegawai) " + "from StatusPegawai a") List> getListStatusPegawai(); - - @Query("select NEW Map (" - + "a.id as kedudukan," - + "a.name as namaKedudukan) " - + "from Kedudukan a") + + @Query("select NEW Map (" + "a.id as kedudukan," + "a.name as namaKedudukan) " + "from Kedudukan a") List> getListKedudukan(); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.name as name) " - + "from StatusKawin a") + + @Query("select NEW Map (" + "a.id as id, " + "a.name as name) " + "from StatusKawin a") List> getListStatusKawin(); - - //------------------------------------------------------------------------------------ - - @Query("select NEW Map (" - + "a.pensiun as pensiun, " - + "b.namaJabatan as jabatanFungsional, " - + "b.id as jabatanFungsionalId, " - + "c.namaJabatan as jabatanInternal, " - + "c.id as jabatanInternalId, " - + "d.namaJabatan as jabatanStruktural, " - + "d.id as jabatanStrukturalId, " - + "e.namaRuangan as namaRuangan, " - + "e.id as namaRuanganId, " - + "f.eselon as eselon, " - + "f.id as eselonId, " - + "g.golonganPegawai as namaGolongan, " - + "g.id as golonganId, " - + "h.statusPegawai as statusPegawai, " - + "h.id as statusPegawaiId, " - + "i.statusPerkawinan as statusKawin, " - + "i.id as statusKawinId, " - + "j.name as kedudukan, " - + "j.id as kedudukanId) " - + "from MapPegawaiJabatanToUnitKerja m " - + "left join m.pegawai a " - + "left join a.jabatanFungsional b " - + "left join m.jabatan c " - + "left join a.jabatanStruktural d " - + "left join a.ruangan e " - + "left join a.eselon f " - + "left join a.golonganPegawai g " - + "left join a.statusPegawai h " - + "left join a.statusKawin i " - + "left join a.kedudukan j " - + "where m.isPrimary is true " - + "and m.statusEnabled is true " - + "and a.id=:id") - Map getDataPegawaiMuSaRe( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "b.id as id, " - + "b.reportDisplay as grade) " - + "from EvaluasiJabatan a " - + "left join a.grade b " - + "left join a.pegawai c " - + "where c.id=:id and a.tahun=:tahun") - Map getGradeByPegawai( - @Param("id") Integer id, - @Param("tahun") Integer tahun); - - @Query("select NEW Map (" - + "a.id as id, " - + "a.jenisKeputusan as jenisKeputusan) " - + "from JenisKeputusan a " - + "where a.statusEnabled is true " - + "order by a.id") + + // ------------------------------------------------------------------------------------ + + @Query("select NEW Map (" + "a.pensiun as pensiun, " + "b.namaJabatan as jabatanFungsional, " + + "b.id as jabatanFungsionalId, " + "c.namaJabatan as jabatanInternal, " + "c.id as jabatanInternalId, " + + "d.namaJabatan as jabatanStruktural, " + "d.id as jabatanStrukturalId, " + + "e.namaRuangan as namaRuangan, " + "e.id as namaRuanganId, " + "f.eselon as eselon, " + + "f.id as eselonId, " + "g.golonganPegawai as namaGolongan, " + "g.id as golonganId, " + + "gp.namaGolongan as golonganPPPK, " + "gp.id as golonganPPPKId, " + "h.statusPegawai as statusPegawai, " + + "h.id as statusPegawaiId, " + "i.statusPerkawinan as statusKawin, " + "i.id as statusKawinId, " + + "j.name as kedudukan, " + "j.id as kedudukanId) " + "from MapPegawaiJabatanToUnitKerja m " + + "left join m.pegawai a " + "left join a.jabatanFungsional b " + "left join m.jabatan c " + + "left join a.jabatanStruktural d " + "left join a.ruangan e " + "left join a.eselon f " + + "left join a.golonganPegawai g " + "left join a.golonganPPPK gp " + "left join a.statusPegawai h " + + "left join a.statusKawin i " + "left join a.kedudukan j " + "where m.isPrimary is true " + + "and m.statusEnabled is true " + "and a.id=:id") + Map getDataPegawaiMuSaRe(@Param("id") Integer id); + + @Query("select NEW Map (" + "b.id as id, " + "b.reportDisplay as grade) " + "from EvaluasiJabatan a " + + "left join a.grade b " + "left join a.pegawai c " + "where c.id=:id and a.tahun=:tahun") + Map getGradeByPegawai(@Param("id") Integer id, @Param("tahun") Integer tahun); + + @Query("select NEW Map (" + "a.id as id, " + "a.jenisKeputusan as jenisKeputusan) " + "from JenisKeputusan a " + + "where a.statusEnabled is true " + "order by a.id") List> getListJenisKeputusan(); - - @Query("select NEW Map (" - + "a.noRec as noRec," - + "a.statusMusare as statusMusare," - + "b.id as pegawaiId," - + "c.id as ruanganId," - + "d.id as jabatanStrukturalId," - + "e.id as jabatanFungsionalId," - + "f.id as jabatanInternalId," - + "g.id as eselonId," - + "h.id as pangkatId) " - + "from PlanningPegawaiMuSaRe a " - + "left join a.pegawai b " - + "left join a.ruanganExec c " - + "left join a.jabatanStrukturalExec d " - + "left join a.jabatanFungsionalExec e " - + "left join a.jabatanInternalExec f " - + "left join a.eselonExec g " - + "left join a.pangkatExec h " - + "where a.approvalStatus=1 and " - + "date(a.tglPlanning)=date(:date) " - + "and a.statusEnabled is null") - List> getDataPlanningByDate( - @Param("date") Date date); - - @Query("select NEW Map (" - + "a.nipPns as nip," - + "a.namaLengkap as namaPegawai," - + "b.namaJabatan as jabatan) " - + "from MapPegawaiJabatanToUnitKerja m " - + "left join m.pegawai a " - + "left join m.jabatan b " - + "where m.isPrimary is true " - + "and m.statusEnabled is true " - + "and a.id=:id") - Map getHeaderHistory( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.noRec as noRec," - + "c.jenisHukuman as jenisHukuman," - + "d.noSK as noSK," - + "d.tglTTSK as tglSk," - + "d.tglBerlakuAwal as tglMulai," - + "d.tglBerlakuAkhir as tglSelesai," - + "a.deskripsiMutasiSanksiResignExec as keterangan) " - + "from PlanningPegawaiMuSaRe a " - + "left join a.pegawai b " - + "left join a.jenisHukumanExec c " - + "left join a.noSk d " - + "where b.id=:id and " - + "a.statusMusare=2 and " + + @Query("select NEW Map (" + "a.noRec as noRec," + "a.statusMusare as statusMusare," + "b.id as pegawaiId," + + "c.id as ruanganId," + "d.id as jabatanStrukturalId," + "e.id as jabatanFungsionalId," + + "f.id as jabatanInternalId," + "g.id as eselonId," + "h.id as pangkatId) " + + "from PlanningPegawaiMuSaRe a " + "left join a.pegawai b " + "left join a.ruanganExec c " + + "left join a.jabatanStrukturalExec d " + "left join a.jabatanFungsionalExec e " + + "left join a.jabatanInternalExec f " + "left join a.eselonExec g " + "left join a.pangkatExec h " + + "where a.approvalStatus=1 and " + "date(a.tglPlanning)=date(:date) " + "and a.statusEnabled is null") + List> getDataPlanningByDate(@Param("date") Date date); + + @Query("select NEW Map (" + "a.nipPns as nip," + "a.namaLengkap as namaPegawai," + "b.namaJabatan as jabatan) " + + "from MapPegawaiJabatanToUnitKerja m " + "left join m.pegawai a " + "left join m.jabatan b " + + "where m.isPrimary is true " + "and m.statusEnabled is true " + "and a.id=:id") + Map getHeaderHistory(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.noRec as noRec," + "c.jenisHukuman as jenisHukuman," + "d.noSK as noSK," + + "d.tglTTSK as tglSk," + "d.tglBerlakuAwal as tglMulai," + "d.tglBerlakuAkhir as tglSelesai," + + "a.deskripsiMutasiSanksiResignExec as keterangan) " + "from PlanningPegawaiMuSaRe a " + + "left join a.pegawai b " + "left join a.jenisHukumanExec c " + "left join a.noSk d " + + "where b.id=:id and " + "a.statusMusare=2 and " + "a.approvalStatus=1") + List> getHistoryExecSanksi(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.noRec as noRec," + "c.noSK as noSK," + "c.tglTTSK as tglSk," + + "c.tglBerlakuAwal as tglMulai," + "a.deskripsiMutasiSanksiResignExec as keterangan," + + "d.name as pangkatGolongan) " + "from PlanningPegawaiMuSaRe a " + "left join a.pegawai b " + + "left join a.noSk c " + "left join a.pangkatExec d " + "where b.id=:id and " + "a.statusMusare=1 and " + "a.approvalStatus=1") - List> getHistoryExecSanksi( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.noRec as noRec," - + "c.noSK as noSK," - + "c.tglTTSK as tglSk," - + "c.tglBerlakuAwal as tglMulai," - + "a.deskripsiMutasiSanksiResignExec as keterangan," - + "d.name as pangkatGolongan) " - + "from PlanningPegawaiMuSaRe a " - + "left join a.pegawai b " - + "left join a.noSk c " - + "left join a.pangkatExec d " - + "where b.id=:id and " - + "a.statusMusare=1 and " - + "a.approvalStatus=1") - List> getHistoryExecPangkat( - @Param("id") Integer id); - - @Query("select NEW Map (" - + "a.noRec as noRec," - + "c.noSK as noSK," - + "c.tglTTSK as tglSk," - + "c.tglBerlakuAwal as tglMulaiBerlaku," - + "a.deskripsiMutasiSanksiResignExec as keterangan," - + "d.namaRuangan as satuanKerja," - + "e.namaJabatan as jabatan," - + "f.eselon as eselon) " - + "from PlanningPegawaiMuSaRe a " - + "left join a.pegawai b " - + "left join a.noSk c " - + "left join a.ruanganExec d " - + "left join a.jabatanInternalExec e " - + "left join a.eselonExec f " - + "where b.id=:id and " - + "a.statusMusare=1 and " - + "a.approvalStatus=1") - List> getHistoryExecJabatan( - @Param("id") Integer id); + List> getHistoryExecPangkat(@Param("id") Integer id); + + @Query("select NEW Map (" + "a.noRec as noRec," + "c.noSK as noSK," + "c.tglTTSK as tglSk," + + "c.tglBerlakuAwal as tglMulaiBerlaku," + "a.deskripsiMutasiSanksiResignExec as keterangan," + + "d.namaRuangan as satuanKerja," + "e.namaJabatan as jabatan," + "f.eselon as eselon) " + + "from PlanningPegawaiMuSaRe a " + "left join a.pegawai b " + "left join a.noSk c " + + "left join a.ruanganExec d " + "left join a.jabatanInternalExec e " + "left join a.eselonExec f " + + "where b.id=:id and " + "a.statusMusare=1 and " + "a.approvalStatus=1") + List> getHistoryExecJabatan(@Param("id") Integer id); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiStatusDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiStatusDao.java index 258c3128..62e72afc 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiStatusDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiStatusDao.java @@ -1,14 +1,13 @@ package com.jasamedika.medifirst2000.dao; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus; +import java.util.List; +import java.util.Map; @Repository("PlanningPegawaiStatusDao") public interface PlanningPegawaiStatusDao extends JpaRepository { @@ -307,16 +306,18 @@ public interface PlanningPegawaiStatusDao extends JpaRepository> getCetakCutiLuarNegeri(@Param("norec") String norec); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/GajiPegawaiDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/GajiPegawaiDaoCustomImpl.java index 1b73bbaa..81b78527 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/GajiPegawaiDaoCustomImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/GajiPegawaiDaoCustomImpl.java @@ -1,16 +1,14 @@ package com.jasamedika.medifirst2000.dao.custom.impl; -import java.util.List; -import java.util.Map; - -import javax.persistence.Query; - -import org.springframework.stereotype.Repository; - import com.jasamedika.medifirst2000.dao.custom.GajiPegawaiDaoCustom; import com.jasamedika.medifirst2000.dao.custom.base.impl.CoreDaoImpl; import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapGaji; import com.jasamedika.medifirst2000.util.CommonUtil; +import org.springframework.stereotype.Repository; + +import javax.persistence.Query; +import java.util.List; +import java.util.Map; @Repository public class GajiPegawaiDaoCustomImpl extends CoreDaoImpl implements GajiPegawaiDaoCustom { @@ -187,11 +185,13 @@ public class GajiPegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa buffer.append(" pegawai.id as idPegawai, " + " pegawai.nama as nama, " + " pegawai.namaLengkap as namaLengkap, " + " pegawai.tglLahir as tglLahir, " + " pegawai.tempatLahir as tempatLahir," + " pegawai.gelarDepan as gelarDepan," + " pegawai.gelarBelakang as gelarBelakang," - + " golongan.golonganPegawai as namaGolongan, " + " agama.agama as agama, " - + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + " golongan.golonganPegawai as namaGolongan, " + " golonganPPPK.namaGolongan as golonganPPPK, " + + " agama.agama as agama, " + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + " dokumen.namaJudulDokumen as namaJudulDokumen, " + " eselon.eselon as eselon, " + " golonganDarah.golonganDarah as golonganDarah, " + " jabatanFungsional.namaJabatan as namaJabatan, " + " jabatanInternal.namaJabatan as jabatanInternal, " + " jabatanInternal.id as idJabatanInternal," @@ -63,8 +63,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + " statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + " suku.suku as suku, " + " titlePasien.namaTitle as titlePasien, " + " typePegawai.typePegawai as typePegawai) " + " from MapPegawaiJabatanToUnitKerja mapPegawai " + " left join mapPegawai.pegawai pegawai " - + " left join pegawai.golonganPegawai golongan " + " left join pegawai.agama agama " - + " left join pegawai.detailKategoryPegawai detailKategoryPegawai " + + " left join pegawai.golonganPegawai golongan " + " left join pegawai.golonganPPPK golonganPPPK " + + " left join pegawai.agama agama " + " left join pegawai.detailKategoryPegawai detailKategoryPegawai " + " left join pegawai.dokumen dokumen " + " left join pegawai.eselon eselon " + " left join pegawai.golonganDarah golonganDarah " + " left join pegawai.jabatanFungsional jabatanFungsional " @@ -122,6 +122,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa buffer.append(" ( "); buffer.append(" p.nipPns , p.namaLengkap ,p.tglLahir , " + "p.tempatLahir , p.noHandphone," + "p.alamat , " + "jabatanInternal.kdJabatan,jabatanInternal.namaJabatan, " + "golongan.id,golongan.golonganPegawai, " + + "golonganPPPK.id as golonganPPPKId,golonganPPPK.namaGolongan as golonganPPPK, " + " statusKawin.statusPerkawinan, statusKawin.id, " + "agama.agama, agama.kdAgama, " + " satuanKerja.kdSatuanKerja,satuanKerja.satuanKerja , " + " jabatanStruktural.kdJabatan ,jabatanStruktural.namaJabatan, " @@ -129,9 +130,9 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + " jabatanFungsional.kdJabatan ,jabatanFungsional.namaJabatan"); buffer.append(" ) "); buffer.append("from Pegawai p " + " left join p.jabatanInternal jabatanInternal" - + " left join p.golonganPegawai golongan " + " left join p.statusKawin statusKawin " - + " left join p.agama agama " + " left join p.satuanKerja satuanKerja " - + " left join p.jabatanStruktural jabatanStruktural " + + " left join p.golonganPegawai golongan " + " left join p.golonganPPPK golonganPPPK " + + " left join p.statusKawin statusKawin " + " left join p.agama agama " + + " left join p.satuanKerja satuanKerja " + " left join p.jabatanStruktural jabatanStruktural " + " left join p.jabatanFungsional jabatanFungsional " + " left join p.jenisKelamin jenisKelamin " + " left join p.jenisPegawai jenisPegawai " + " where p.statusEnabled is true and jenisPegawai=12 " + " order by p.namaLengkap "); @@ -151,8 +152,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa buffer.append(" ( "); buffer.append(" pegawai.id as idPegawai, " + " pegawai.namaLengkap as nama, " + " pegawai.tglLahir as tglLahir, " + " pegawai.tempatLahir as tempatLahir," - + " golongan.name as namaGolongan, " + " agama.agama as agama, " - + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + " golongan.golonganPegawai as namaGolongan, " + " golonganPPPK.namaGolongan as golonganPPPK, " + + " agama.agama as agama, " + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + " dokumen.namaJudulDokumen as namaJudulDokumen, " + " eselon.eselon as eselon, " + " golonganDarah.golonganDarah as golonganDarah, " + " jabatanFungsional.namaJabatan as namaJabatan, " + " jabatanInternal.namaJabatan as jabatanInternal, " + " jabatanInternal.id as idJabatanInternal," @@ -173,8 +174,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + " statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + " suku.suku as suku, " + " titlePasien.namaTitle as titlePasien, " + " typePegawai.typePegawai as typePegawai) " + " MapPegawaiJabatanToUnitKerja mapPegawai " + " left join mapPegawai.pegawai pegawai " - + " left join pegawai.golonganPegawai golongan " + " left join pegawai.agama agama " - + " left join pegawai.detailKategoryPegawai detailKategoryPegawai " + + " left join pegawai.golonganPegawai golongan " + " left join pegawai.golonganPPPK golonganPPPK " + + " left join pegawai.agama agama " + " left join pegawai.detailKategoryPegawai detailKategoryPegawai " + " left join pegawai.dokumen dokumen " + " left join pegawai.eselon eselon " + " left join pegawai.golonganDarah golonganDarah " + " left join pegawai.jabatanFungsional jabatanFungsional " @@ -212,8 +213,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa buffer.append(" ( "); buffer.append(" pegawai.id as idPegawai, " + " pegawai.namaLengkap as nama, " + " pegawai.tglLahir as tglLahir, " + " pegawai.tempatLahir as tempatLahir," - + " golongan.golonganPegawai as namaGolongan, " + " agama.agama as agama, " - + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + + " golongan.golonganPegawai as namaGolongan, " + " golonganPPPK.namaGolongan as golonganPPPK, " + + " agama.agama as agama, " + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " + " dokumen.namaJudulDokumen as namaJudulDokumen, " + " eselon.eselon as eselon, " + " golonganDarah.golonganDarah as golonganDarah, " + " jabatanFungsional.namaJabatan as namaJabatan, " + " jabatanInternal.namaJabatan as jabatanInternal, " + " jabatanInternal.id as idJabatanInternal," @@ -234,8 +235,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + " statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + " suku.suku as suku, " + " titlePasien.namaTitle as titlePasien, " + " typePegawai.typePegawai as typePegawai) " + " from MapPegawaiJabatanToUnitKerja mapPegawai " + " left join mapPegawai.pegawai pegawai " - + " left join pegawai.golonganPegawai golongan " + " left join pegawai.agama agama " - + " left join pegawai.detailKategoryPegawai detailKategoryPegawai " + + " left join pegawai.golonganPegawai golongan " + " left join pegawai.golonganPPPK golonganPPPK " + + " left join pegawai.agama agama " + " left join pegawai.detailKategoryPegawai detailKategoryPegawai " + " left join pegawai.dokumen dokumen " + " left join pegawai.eselon eselon " + " left join pegawai.golonganDarah golonganDarah " + " left join pegawai.jabatanFungsional jabatanFungsional " @@ -304,8 +305,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.isStrSeumurHidup as isStrSeumurHidup," + "pegawai.gelarDepan as gelarDepan," + "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir," - + "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama," - + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + + "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK," + + "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon," + "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah," + "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar," @@ -341,7 +342,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "left join pegawai.kualifikasiJurusan kualifikasiJurusan " + "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara " + "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan " - + "left join pegawai.pendidikan pendidikan " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan " + "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak " + "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja " + "left join pegawai.rekanan rekanan " + "left join pegawai.shiftKerja shiftKerja " @@ -445,8 +446,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan," + "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir," - + "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama," - + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + + "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK," + + "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon," + "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah," + "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar," @@ -482,7 +483,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "left join pegawai.kualifikasiJurusan kualifikasiJurusan " + "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara " + "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan " - + "left join pegawai.pendidikan pendidikan " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan " + "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak " + "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja " + "left join pegawai.rekanan rekanan " + "left join pegawai.shiftKerja shiftKerja " @@ -552,8 +553,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan," + "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir," - + "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama," - + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + + "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK," + + "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," + "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon," + "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah," + "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar," @@ -592,7 +593,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "left join pegawai.kualifikasiJurusan kualifikasiJurusan " + "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara " + "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan " - + "left join pegawai.pendidikan pendidikan " + + "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan " + "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak " + // "left join pegawai.range range "+ "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java index c1d23ca5..64ec7465 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java @@ -1,55 +1,19 @@ package com.jasamedika.medifirst2000.service.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.StrukBuktiPengeluaranCaraBayarDao; -import com.jasamedika.medifirst2000.dao.StrukBuktiPengeluaranDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananPenjaminDao; -import com.jasamedika.medifirst2000.dao.StrukVerifikasiDao; +import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dao.custom.GajiPegawaiDaoCustom; -import com.jasamedika.medifirst2000.entities.BankAccount; -import com.jasamedika.medifirst2000.entities.CaraBayar; -import com.jasamedika.medifirst2000.entities.DetailKamar; -import com.jasamedika.medifirst2000.entities.JenisKartu; -import com.jasamedika.medifirst2000.entities.KelompokPasien; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PasienDaftar; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StrukBuktiPenerimaan; -import com.jasamedika.medifirst2000.entities.StrukBuktiPengeluaran; -import com.jasamedika.medifirst2000.entities.StrukBuktiPengeluaranCaraBayar; -import com.jasamedika.medifirst2000.entities.StrukClosing; -import com.jasamedika.medifirst2000.entities.StrukPelayanan; -import com.jasamedika.medifirst2000.entities.StrukPelayananPenjamin; -import com.jasamedika.medifirst2000.entities.StrukVerifikasi; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.GajiPegawaiService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.BankAccountVO; -import com.jasamedika.medifirst2000.vo.CaraBayarVO; -import com.jasamedika.medifirst2000.vo.JenisKartuVO; -import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO; -import com.jasamedika.medifirst2000.vo.MappingKirimDokumenPasienVO; -import com.jasamedika.medifirst2000.vo.StrukBuktiPengeluaranCaraBayarVO; -import com.jasamedika.medifirst2000.vo.StrukBuktiPengeluaranVO; -import com.jasamedika.medifirst2000.vo.StrukClosingVO; -import com.jasamedika.medifirst2000.vo.StrukVerifikasiVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.*; @Service("GajiPegawaiService") public class GajiPegawaiServiceImpl extends BaseVoServiceImpl implements GajiPegawaiService { @@ -177,6 +141,7 @@ public class GajiPegawaiServiceImpl extends BaseVoServiceImpl implements GajiPeg data1.put("kelTransaksi", map1.get("kelTransaksi")); data1.put("total", map1.get("total")); data1.put("golPegawai", map1.get("golPegawai")); + data1.put("golonganPPPK", map1.get("golonganPPPK")); data1.put("rekeningAtasNama", map1.get("rekeningAtasNama")); data1.put("namaBank", map1.get("namaBank")); data1.put("noRekening", map1.get("noRekening")); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollReportingServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollReportingServiceImpl.java index df53436a..e3949572 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollReportingServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollReportingServiceImpl.java @@ -1,17 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.jasamedika.medifirst2000.dao.JabatanDao; import com.jasamedika.medifirst2000.dao.PayRollPegawaiDao; import com.jasamedika.medifirst2000.dao.PayRollReportingDao; import com.jasamedika.medifirst2000.dao.PegawaiDao; @@ -20,7 +8,16 @@ import com.jasamedika.medifirst2000.dto.PayRollReportUangMakanDto; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.service.PayRollPegawaiService; import com.jasamedika.medifirst2000.service.PayRollReportingService; -import com.jasamedika.medifirst2000.util.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service("PayRollReportingService") public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements PayRollReportingService { @@ -55,6 +52,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa String nipPns=(String) map.get("nipPns"); Integer golonganPegawaiId=(Integer) map.get("golonganPegawaiId"); String golonganPegawai=(String) map.get("golonganPegawai"); + String golonganPPPK=(String) map.get("golonganPPPK"); String namaLengkap=(String) map.get("namaLengkap"); BigDecimal hargaSatuan=(BigDecimal) map.get("hargaSatuan"); Integer komponenHargaId=(Integer) map.get("komponenHargaId"); @@ -63,6 +61,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa mapKomponen.put("nip", nipPns); mapKomponen.put("namaPegawai", namaLengkap); mapKomponen.put("golongan", golonganPegawai); + mapKomponen.put("golonganPPPK", golonganPPPK); mapKomponen.put("jumlahKehadiran", new Long(0)); mapKomponen.put("tarifUangMakanPerHari", new Double(0)); mapKomponen.put("jumlahKotor",""); @@ -166,6 +165,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa String nipPns=(String) map.get("nipPns"); Integer golonganPegawaiId=(Integer) map.get("golonganPegawaiId"); String golonganPegawai=(String) map.get("golonganPegawai"); + String golonganPPPK=(String) map.get("golonganPPPK"); String namaLengkap=(String) map.get("namaLengkap"); BigDecimal hargaSatuan=(BigDecimal) map.get("hargaSatuan"); Integer komponenHargaId=(Integer) map.get("komponenHargaId"); @@ -174,6 +174,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa mapKomponen.put("nip", nipPns); mapKomponen.put("namaPegawai", namaLengkap); mapKomponen.put("golongan", golonganPegawai); + mapKomponen.put("golonganPPPK", golonganPPPK); mapKomponen.put("jumlahKehadiran", 0); mapKomponen.put("tarifUangMakanPerHari",0); mapKomponen.put("jumlahKotor",0); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java index 35fdac51..1b4d1fa3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java @@ -1,51 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiMuSaReDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.LoginUserService; +import com.jasamedika.medifirst2000.service.PegawaiMutasiSanksiResignService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.EselonDao; -import com.jasamedika.medifirst2000.dao.GolonganDao; -import com.jasamedika.medifirst2000.dao.JabatanDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PlanningPegawaiMuSaReDao; -import com.jasamedika.medifirst2000.dao.PlanningPegawaiStatusDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; -import com.jasamedika.medifirst2000.dao.StatusPegawaiDao; -import com.jasamedika.medifirst2000.dao.StrukPlanningDao; -import com.jasamedika.medifirst2000.dao.SuratKeputusanDao; -import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiMuSaReDaoCustom; -import com.jasamedika.medifirst2000.entities.Eselon; -import com.jasamedika.medifirst2000.entities.Golongan; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.JenisHukuman; -import com.jasamedika.medifirst2000.entities.JenisKeputusan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PlanningPegawaiMuSaRe; -import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StatusPegawai; -import com.jasamedika.medifirst2000.entities.StrukPlanning; -import com.jasamedika.medifirst2000.entities.SuratKeputusan; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.PegawaiMutasiSanksiResignService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.EselonVO; -import com.jasamedika.medifirst2000.vo.GolonganVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.JenisHukumanVO; -import com.jasamedika.medifirst2000.vo.JenisKeputusanVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PlanningPegawaiMuSaReVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.StrukPlanningVO; - @Service("PegawaiMutasiSanksiResignService") public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksiResignService{ @@ -246,6 +217,13 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi result.put("pangkatId", 0); result.put("namaPangkat", "-"); } + if(CommonUtil.isNotNullOrEmpty(data.get("golonganPPPKId"))){ + result.put("golonganPPPKId", data.get("golonganPPPKId")); + result.put("golonganPPPK", data.get("golonganPPPK")); + } else{ + result.put("golonganPPPKId", "-"); + result.put("golonganPPPK", "-"); + } return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index 851d7869..d608bf5e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -147,6 +147,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Autowired private RekananDao rekananDao; + @Autowired + private GolonganPPPKDao golonganPPPKDao; + @Autowired private PegawaiDaoCustom pegawaiDaoCustom; @@ -1895,6 +1898,10 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } result.remove("pangkatId"); } + if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) { + Optional byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString()); + byId.ifPresent(golonganPPPK -> result.put("golonganPPPK", golonganPPPK)); + } if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) { Map rekanan = rekananDao .getRekananById(Integer.parseInt(result.get("rekananId").toString()));