From 5ed9638ccc2b52d219728e220e4fe41d9020158d Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 20 Feb 2024 10:59:51 +0700 Subject: [PATCH 1/2] Update pegawai service Penambahan informasi flag seumur hidup sip dan str di data pegawai --- .../medifirst2000/dao/PegawaiDao.java | 5 ++-- .../dao/custom/impl/PegawaiDaoCustomImpl.java | 23 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) 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 9db257d4..635d4123 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 @@ -354,8 +354,9 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.nilaiJabatan as nilaiJabatan," + "levelTingkat.id as idLevelTingkat," + "levelTingkat.levelTingkat as levelTingkat," + "pegawai.grade as grade," + "pegawai.noSip as noSip," + "pegawai.tglTerbitSip as tglTerbitSip," + "pegawai.tglBerakhirSip as tglBerakhirSip," - + "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr," - + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan," + + "pegawai.isSipSeumurHidup as isSipSeumurHidup," + "pegawai.noStr as noStr," + + "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," diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java index 1495ff82..ac1813d8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java @@ -1,15 +1,5 @@ package com.jasamedika.medifirst2000.dao.custom.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.persistence.Query; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom; @@ -17,6 +7,14 @@ import com.jasamedika.medifirst2000.dao.custom.base.impl.CoreDaoImpl; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.PegawaiJadwalKerja; import com.jasamedika.medifirst2000.util.CommonUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import javax.persistence.Query; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * Repository PegawaiDaoCustomImpl class @@ -329,8 +327,9 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "pegawai.nilaiJabatan as nilaiJabatan," + "levelTingkat.id as idLevelTingkat," + "levelTingkat.levelTingkat as levelTingkat," + "pegawai.grade as grade," + "pegawai.noSip as noSip," + "pegawai.tglTerbitSip as tglTerbitSip," + "pegawai.tglBerakhirSip as tglBerakhirSip," - + "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr," - + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan," + + "pegawai.isSipSeumurHidup as isSipSeumurHidup," + "pegawai.noStr as noStr," + + "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," From e1cd94e9693d4d820dbb7c9bd8a92378cb77cd6d Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 20 Feb 2024 13:11:46 +0700 Subject: [PATCH 2/2] Update PegawaiDao.java Perbaikan service notifikasi expired sip str --- .../java/com/jasamedika/medifirst2000/dao/PegawaiDao.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 635d4123..f045af2a 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 @@ -668,7 +668,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join mapPegawai.pegawai p " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.id = :id " - + "and (tglBerakhirSip <= :date or p.isSipSeumurHidup is false) " + "order by tglBerakhirSip, namaLengkap") + + "and tglBerakhirSip <= :date " + "and p.isSipSeumurHidup is false " + + "order by tglBerakhirSip, namaLengkap") Map findSipExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (p.id as id, " + "p.tglBerakhirStr as tglBerakhirStr, " @@ -678,7 +679,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join mapPegawai.pegawai p " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.id = :id " - + "and (tglBerakhirStr <= :date or p.isStrSeumurHidup is false) " + "order by tglBerakhirStr, namaLengkap") + + "and tglBerakhirStr <= :date " + "and p.isStrSeumurHidup is false " + + "order by tglBerakhirStr, namaLengkap") Map findStrExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (unitKerja.name as unitKerja, count(pegawai.id) as value )"