From 62cae9f3e2885b0af0f7c4a0b784453b8a08f743 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 21 Jun 2021 10:50:25 +0700 Subject: [PATCH] penerapan sotk untuk cetakan surat izin --- .../medifirst2000/dao/PegawaiDao.java | 19 +++++++--- .../service/impl/ReportServiceImpl.java | 35 +++---------------- 2 files changed, 18 insertions(+), 36 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 ef0040a5..49348ebf 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 @@ -279,7 +279,7 @@ public interface PegawaiDao extends PagingAndSortingRepository public Jabatan findJabatanByIdPegawai(@Param("id") Integer id); @Query("select peg from MapPegawaiJabatanToUnitKerja mappeg left join mappeg.pegawai peg where mappeg.pegawaiId=:idPegawai " - + "and mappeg.jabatanId=:idJabatan and mappeg.isPrimary is true and mappeg.statusEnabled is true") + + "and mappeg.jabatanId=:idJabatan and mappeg.statusEnabled is true") public Pegawai findPegawaiByIdJabatanInternal(@Param("idPegawai") Integer idPegawai, @Param("idJabatan") Integer idJabatan); @@ -536,7 +536,7 @@ public interface PegawaiDao extends PagingAndSortingRepository public List findPegawaiStatusAktif(@Param("idKelompokShift") Integer idKelompokShift, @Param("tahun") String tahun); - @Query("select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, " + String strQryJabatanCetak = "select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, " + "golongan.golonganPegawai as namaGolongan, " + "pegawai.noTlp as noTlp, " + "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, " + "pegawai.alamat as alamat, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, " @@ -581,9 +581,18 @@ public interface PegawaiDao extends PagingAndSortingRepository + "left join pegawai.statusPerkawinanPegawai statusPerkawinanPegawai " + "left join pegawai.suku suku " + "left join pegawai.titlePasien titlePasien " + "left join ruangan.departemen departemen " + "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true " - + "and mappegawai.isPrimary is true " + "and mappegawai.statusEnabled is true " - + "and pegawai.id =:idPegawai") - public Map findPegawaiById(@Param("idPegawai") Integer idPegawai); + + "and mappegawai.statusEnabled is true "; + + String cdtJabatanCetak = "and mappegawai.jabatanId =:jabatanId and pegawai.id =:pegawaiId"; + + String cdtJabatanUtamaCetak = "and mappegawai.isPrimary is true and pegawai.id =:pegawaiId"; + + @Query(strQryJabatanCetak + cdtJabatanUtamaCetak) + public Map findPegawaiById(@Param("pegawaiId") Integer idPegawai); + + @Query(strQryJabatanCetak + cdtJabatanCetak) + public Map findPegawaiById(@Param("pegawaiId") Integer idPegawai, + @Param("jabatanId") Integer idJabatan); // GET ALL DOKTER BY RUANGAN KERJA @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,m.jabatan.id as idJabatanInternal, m.jabatan.namaJabatan as namaJabatan) " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index fa143395..e4d1ed15 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -64,7 +64,6 @@ import com.jasamedika.medifirst2000.dto.SuratPesananSementaraDto; import com.jasamedika.medifirst2000.entities.Jabatan; import com.jasamedika.medifirst2000.entities.JenisLimbahB3Masuk; import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex; import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus; import com.jasamedika.medifirst2000.entities.StatusPegawai; @@ -2682,25 +2681,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic Integer idAtasan1 = 0; Integer idAtasan2 = 0; Integer kaRu = 0; - // if(CommonUtil.isNotNullOrEmpty(planningPegawaiStatus.getKeterangan())) - // { - // String[] idPenandatangan = - // planningPegawaiStatus.getKeterangan().split(","); - // idAtasan1 = Integer.valueOf(idPenandatangan[0]); - // idAtasan2 = Integer.valueOf(idPenandatangan[1]); - // kaRu = Integer.valueOf(idPenandatangan[2]); - // } Map dataCuti = this.generateLapPermohonanCuti(noRecPlanning, idJabatan, idAtasan1, idAtasan2, kaRu); result.putAll(dataCuti); - // listTgl = planningPegawaiStatusDao - // .getListTanggalCutiApproved(planningPegawaiStatus.getNoRec()); - // String tgl = ""; - // for (Map data : listTgl) { - // tgl += new SimpleDateFormat("dd-MM-yyyy").format(data.get("tgl")) - // + ", "; - // } - // result.put("endDate", tgl); } PegawaiHistoriRekapIndex pegawaiHistoriRekapIndex = pegawaiHistoriRekapIndexDao .getPegawaiHistoriRekapIndex(noRecPlanning); @@ -2710,20 +2693,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } if (CommonUtil.isNotNullOrEmpty(atasanId) && CommonUtil.isNotNullOrEmpty(jabatanAtasanId)) { - Pegawai pegawaiTemp = pegawaiDao.findPegawaiByIdJabatanInternal(atasanId, jabatanAtasanId); - // if (CommonUtil.isNotNullOrEmpty(pegawaiTemp)) { - // List pegawaiTemps = - // pegawaiDao.findByJabatanFungsional(jabatanAtasanId); - // if (CommonUtil.isNotNullOrEmpty(pegawaiTemps)) { - // pegawaiTemp = pegawaiTemps.get(0); - // } - // } - if (CommonUtil.isNotNullOrEmpty(pegawaiTemp)) { - Map atasan = pegawaiDao.findPegawaiById(pegawaiTemp.getId()); - result.put("namaAtasan", atasan.get("nama")); - result.put("nipAtasan", atasan.get("nipPns")); - result.put("jabatanAtasan", atasan.get("jabatanInternal")); - } + Map atasan = pegawaiDao.findPegawaiById(atasanId, jabatanAtasanId); + result.put("namaAtasan", atasan.get("nama")); + result.put("nipAtasan", atasan.get("nipPns")); + result.put("jabatanAtasan", atasan.get("jabatanInternal")); } return result; }