From 4e0980d587ea368c1ea48251ac8c5c4abf69de0a Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 18 Jan 2021 09:04:12 +0700 Subject: [PATCH] - perbaikan get all mapping akomodasi - perbaikan get all mapping uraian tugas - penerapan no surat izin sementara cuti --- .../dao/MapRuanganToAkomodasiDao.java | 8 +- .../medifirst2000/dao/UraianTugasMDao.java | 34 ++++---- .../MapRuanganToAkomodasiServiceImpl.java | 16 ++-- .../service/impl/ReportServiceImpl.java | 4 +- .../impl/UraianTugasTransaksiServiceImpl.java | 82 +++++++++++++++++-- .../jrxml/suratIzinSementaraCuti.jrxml | 7 +- 6 files changed, 111 insertions(+), 40 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToAkomodasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToAkomodasiDao.java index 3abc9733..3b97907e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToAkomodasiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToAkomodasiDao.java @@ -17,10 +17,10 @@ public interface MapRuanganToAkomodasiDao extends CrudRepository> findAllActiveAkomodasi(); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/UraianTugasMDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/UraianTugasMDao.java index 4bf0352a..ed40a25b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/UraianTugasMDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/UraianTugasMDao.java @@ -13,33 +13,31 @@ import com.jasamedika.medifirst2000.entities.UraianTugasM; @Repository("UraianTugasMDao") public interface UraianTugasMDao extends PagingAndSortingRepository { - @Query("select model from UraianTugasM model where model.statusEnabled is true ") + @Query("select model from UraianTugasM model where model.statusEnabled is true") List findKinerja(); - @Query("select new map(model.periode as periode, jabatan.namaJabatan as namaJabatan,model.jabatanId as jabatanId, rincianKegiatan.rincianKegiatan as rincianKegiatan " - + ", model.rincianKegiatanId as rincianKegiatanId,dokumen.namaJudulDokumen as namaJudulDokumen,model.dokumenId as dokumenId " - + ", pelaksanaanTugas.pelaksanaanTugas as pelaksanaanTugas ,model.pelaksanaanTugasId as pelaksanaanTugasId,model.id as id) " - + " from UraianTugasM model left join model.jabatan jabatan left join model.dokumen dokumen " - + " left join model.rincianKegiatan rincianKegiatan " - + " left join model.pelaksanaanTugas pelaksanaanTugas " + " where model.statusEnabled is true ") + @Query("select new Map(d.id as dokumenId,d.namaJudulDokumen as judulDokumen," + "utm.id as id," + + "j.id as jabatanId,j.namaJabatan as namaJabatan," + + "utm.kdProfile as kdProfile,utm.kodeExternal as kodeExternal,utm.namaExternal as namaExternal,utm.noRec as noRec," + + "pt.id as pelaksanaanTugasId, pt.pelaksanaanTugas as pelaksanaanTugas," + + "utm.periode as periode,utm.reportDisplay as reportDisplay," + + "rk.id as rincianKegiatanId,rk.rincianKegiatan as rincianKegiatan," + + "utm.statusEnabled as statusEnabled) " + "from UraianTugasM utm " + + "left join utm.dokumen d with d.statusEnabled is true " + "inner join utm.jabatan j " + + "left join utm.pelaksanaanTugas pt with pt.statusEnabled is true " + "inner join utm.rincianKegiatan rk " + + "where utm.statusEnabled is true " + "and j.statusEnabled is true " + "and rk.statusEnabled is true") List> findListKinerja(); - @Query("select new Map(mt.id as idUraianTugas," - + "pg.id as idPegawai,pg.namaLengkap as namaPegawai," + @Query("select new Map(mt.id as idUraianTugas," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai," + "jb.id as idJabatan,jb.namaJabatan as namaJabatan," + "rk.id as idRincian,rk.rincianKegiatan as rincianKegiatan, rk.statusVerifikasi as statusVerifikasi," + "pt.id as idPelaksanaanTugas, pt.pelaksanaanTugas as pelaksanaanTugas) " - + "from MapPegawaiJabatanToUnitKerja mp, UraianTugasM mt " - + "left join mp.pegawai pg " - + "left join mp.jabatan jb " - + "left join mt.rincianKegiatan rk " - + "left join mt.pelaksanaanTugas pt " + + "from MapPegawaiJabatanToUnitKerja mp, UraianTugasM mt " + "left join mp.pegawai pg " + + "left join mp.jabatan jb " + "left join mt.rincianKegiatan rk " + "left join mt.pelaksanaanTugas pt " + "where mp.jabatanId = mt.jabatanId " + "and mp.statusEnabled is true and pg.statusEnabled is true and mt.statusEnabled is true " - + "and jb.statusEnabled is true and rk.statusEnabled is true and pt.statusEnabled is true " - + "and pg.id = :idPegawai " - + "and jb.id = :idJabatan " - + "and pt.id = :idPelaksanaanTugas " + + "and jb.statusEnabled is true and rk.statusEnabled is true and pt.statusEnabled is true " + + "and pg.id = :idPegawai " + "and jb.id = :idJabatan " + "and pt.id = :idPelaksanaanTugas " + "order by rk.id") List> getRincianKegiatanPegawai(@Param("idPegawai") Integer idPegawai, @Param("idJabatan") Integer idJabatan, @Param("idPelaksanaanTugas") Integer idPelaksanaanTugas); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java index a5d3453f..814a15b4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java @@ -98,6 +98,7 @@ public class MapRuanganToAkomodasiServiceImpl implements MapRuanganToAkomodasiSe KamarVO kamar = new KamarVO(); RuanganVO ruangan = new RuanganVO(); ProdukVO produk = new ProdukVO(); + if (CommonUtil.isNotNullOrEmpty(map.get("idKamar"))) { kamar.setId(Integer.valueOf(map.get("idKamar").toString())); kamar.setNamaKamar(map.get("namaKamar").toString()); @@ -110,17 +111,16 @@ public class MapRuanganToAkomodasiServiceImpl implements MapRuanganToAkomodasiSe produk.setId(Integer.valueOf(map.get("idProduk").toString())); produk.setNamaProduk(map.get("namaProduk").toString()); } - map.put("kamar", kamar); - map.put("ruangan", ruangan); - map.put("produk", produk); MapRuanganToAkomodasiVO rsMap = new MapRuanganToAkomodasiVO(); rsMap.setId(Integer.valueOf(map.get("id").toString())); if (CommonUtil.isNotNullOrEmpty(map.get("isRawatGabung"))) { rsMap.setIsRawatGabung(Integer.valueOf(map.get("isRawatGabung").toString())); } - if (CommonUtil.isNotNullOrEmpty(kamar)) { + if (CommonUtil.isNotNullOrEmpty(kamar.getId())) { rsMap.setKamar(kamar); + } else { + rsMap.setKamar(null); } if (CommonUtil.isNotNullOrEmpty(map.get("kdProfile"))) { rsMap.setKdProfile(Short.valueOf(map.get("kdProfile").toString())); @@ -134,14 +134,18 @@ public class MapRuanganToAkomodasiServiceImpl implements MapRuanganToAkomodasiSe if (CommonUtil.isNotNullOrEmpty(map.get("noRec"))) { rsMap.setNoRec(map.get("noRec").toString()); } - if (CommonUtil.isNotNullOrEmpty(produk)) { + if (CommonUtil.isNotNullOrEmpty(produk.getId())) { rsMap.setProduk(produk); + } else { + rsMap.setProduk(null); } if (CommonUtil.isNotNullOrEmpty(map.get("reportDisplay"))) { rsMap.setReportDisplay(map.get("reportDisplay").toString()); } - if (CommonUtil.isNotNullOrEmpty(ruangan)) { + if (CommonUtil.isNotNullOrEmpty(ruangan.getId())) { rsMap.setRuangan(ruangan); + } else { + rsMap.setRuangan(null); } if (CommonUtil.isNotNullOrEmpty(map.get("statusEnabled"))) { rsMap.setStatusEnabled(Boolean.valueOf(map.get("statusEnabled").toString())); 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 083def9e..cdcc31e4 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 @@ -2508,6 +2508,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic PlanningPegawaiStatus planningPegawaiStatus = planningPegawaiStatusDao.findOne(noRecPlanning); StatusPegawai statusPegawai = statusPegawaiDao.getAll(planningPegawaiStatus.getStatusPegawaiPlanId()); + String nomorSurat = settingDataFixedDao.getSettingDataFixed("nomorSuratIzinSementaraCuti"); if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatus)) { String tahun = new SimpleDateFormat("yyyy").format(planningPegawaiStatus.getTglPengajuan()); @@ -2540,13 +2541,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("namaPangkatGolongan", pegawai.get("namaPangkat").toString() + "/ " + pegawai.get("namaGolongan").toString()); } else { - result.put("namaPangkatGolongan", ""); + result.put("namaPangkatGolongan", "-/ -"); } result.put("namaJabatan", jabatan.getNamaJabatan()); result.put("unitKerja", unitKerja.getName()); if (CommonUtil.isNotNullOrEmpty(statusPegawai)) { result.put("jenisCuti", statusPegawai.getStatusPegawai()); } + result.put("nomorSurat", nomorSurat); } } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java index 40c020c6..6126a332 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UraianTugasTransaksiServiceImpl.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.config.annotation.web.configurers.UrlAuthorizationConfigurer; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,9 +24,11 @@ import com.jasamedika.medifirst2000.dao.UraianTugasFlexibleDao; import com.jasamedika.medifirst2000.dao.UraianTugasMDao; import com.jasamedika.medifirst2000.dao.UraianTugasTransaksiDao; import com.jasamedika.medifirst2000.entities.DetailUraianTugasTransaksi; +import com.jasamedika.medifirst2000.entities.Dokumen; import com.jasamedika.medifirst2000.entities.Jabatan; import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.entities.Pegawai; +import com.jasamedika.medifirst2000.entities.PelaksanaanTugas; import com.jasamedika.medifirst2000.entities.RincianKegiatan; import com.jasamedika.medifirst2000.entities.UraianTugasFlexible; import com.jasamedika.medifirst2000.entities.UraianTugasM; @@ -235,11 +238,11 @@ public class UraianTugasTransaksiServiceImpl extends BaseVoServiceImpl implement return r; } /* - * public Double getNilai(Double jumlah, Double target) { Double result = jumlah - * / target; return result; } + * public Double getNilai(Double jumlah, Double target) { Double result = + * jumlah / target; return result; } * - * public Double getHasil(Double nilai, Double bobot) { Double result = (nilai * - * bobot) / 100; return result; } + * public Double getHasil(Double nilai, Double bobot) { Double result = + * (nilai * bobot) / 100; return result; } */ @Override @@ -317,17 +320,80 @@ public class UraianTugasTransaksiServiceImpl extends BaseVoServiceImpl implement @Transactional(readOnly = true) public List> findAllUraianTugas() { List> result = new ArrayList>(); - Iterable datas = uraianTugasMDao.findKinerja(); - // result = uraianTugasMDao.findListKinerja(); - for (UraianTugasM data : datas) { + + List listMasterUTM = new ArrayList<>(); + List> data = uraianTugasMDao.findListKinerja(); + for (Map map : data) { + UraianTugasM masterUraianTugas = new UraianTugasM(); + Dokumen dokumen = new Dokumen(); + Jabatan jabatan = new Jabatan(); + PelaksanaanTugas pelaksanaanTugas = new PelaksanaanTugas(); + RincianKegiatan rincianKegiatan = new RincianKegiatan(); + + if (CommonUtil.isNotNullOrEmpty(map.get("dokumenId"))) { + dokumen.setId(Integer.valueOf(map.get("dokumenId").toString())); + dokumen.setNamaJudulDokumen(map.get("judulDokumen").toString()); + masterUraianTugas.setDokumen(dokumen); + } else { + masterUraianTugas.setDokumen(null); + } + masterUraianTugas.setId(Integer.valueOf(map.get("id").toString())); + if (CommonUtil.isNotNullOrEmpty(map.get("jabatanId"))) { + jabatan.setId(Integer.valueOf(map.get("jabatanId").toString())); + jabatan.setNamaJabatan(map.get("namaJabatan").toString()); + masterUraianTugas.setJabatan(jabatan); + } else { + masterUraianTugas.setJabatan(null); + } + if (CommonUtil.isNotNullOrEmpty(map.get("kdProfile"))) { + masterUraianTugas.setKdProfile(Short.valueOf(map.get("kdProfile").toString())); + } + if (CommonUtil.isNotNullOrEmpty(map.get("kodeExternal"))) { + masterUraianTugas.setKodeExternal(map.get("kodeExternal").toString()); + } + if (CommonUtil.isNotNullOrEmpty(map.get("namaExternal"))) { + masterUraianTugas.setNamaExternal(map.get("namaExternal").toString()); + } + if (CommonUtil.isNotNullOrEmpty(map.get("noRec"))) { + masterUraianTugas.setNoRec(map.get("noRec").toString()); + } + if (CommonUtil.isNotNullOrEmpty(map.get("pelaksanaanTugasId"))) { + pelaksanaanTugas.setId(Integer.valueOf(map.get("pelaksanaanTugasId").toString())); + pelaksanaanTugas.setPelaksanaanTugas(map.get("pelaksanaanTugas").toString()); + masterUraianTugas.setPelaksanaanTugas(pelaksanaanTugas); + } else { + masterUraianTugas.setPelaksanaanTugas(null); + } + if (CommonUtil.isNotNullOrEmpty(map.get("periode"))) { + masterUraianTugas.setPeriode(map.get("periode").toString()); + } + if (CommonUtil.isNotNullOrEmpty(map.get("reportDisplay"))) { + masterUraianTugas.setReportDisplay(map.get("reportDisplay").toString()); + } + if (CommonUtil.isNotNullOrEmpty(map.get("rincianKegiatanId"))) { + rincianKegiatan.setId(Integer.valueOf(map.get("rincianKegiatanId").toString())); + rincianKegiatan.setRincianKegiatan(map.get("rincianKegiatan").toString()); + masterUraianTugas.setRincianKegiatan(rincianKegiatan); + } else { + masterUraianTugas.setRincianKegiatan(null); + } + if (CommonUtil.isNotNullOrEmpty(map.get("statusEnabled"))) { + masterUraianTugas.setStatusEnabled(Boolean.valueOf(map.get("statusEnabled").toString())); + } + + listMasterUTM.add(masterUraianTugas); + } + + for (UraianTugasM utm : listMasterUTM) { try { - result.add(data.ToMap()); + result.add(utm.ToMap()); } catch (IllegalArgumentException e) { e.printStackTrace(); } catch (IllegalAccessException e) { e.printStackTrace(); } } + return result; } diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml index b8bc911e..ed138831 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml @@ -13,13 +13,14 @@ + <band height="100" splitType="Stretch"> <textField> - <reportElement x="30" y="30" width="495" height="40" uuid="d708c1a5-ad97-4234-a62c-f815323ae877"/> + <reportElement x="30" y="30" width="495" height="30" uuid="d708c1a5-ad97-4234-a62c-f815323ae877"/> <textElement textAlignment="Center" verticalAlignment="Top"> <font size="12" isBold="true"/> </textElement> @@ -33,11 +34,11 @@ <textFieldExpression><![CDATA["Jakarta, " + new SimpleDateFormat("dd MMMM yyyy", new Locale("in","ID")).format(new Date())]]></textFieldExpression> </textField> <textField> - <reportElement x="30" y="70" width="495" height="20" uuid="e1bd5328-4030-4188-b515-6cae46190bcb"/> + <reportElement x="30" y="60" width="495" height="20" uuid="e1bd5328-4030-4188-b515-6cae46190bcb"/> <textElement textAlignment="Center" verticalAlignment="Top"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA["NOMOR : KP.04.02/XXI.2/ /2021"]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{nomorSurat} != null ? "NOMOR : " + $F{nomorSurat} : "" ]]></textFieldExpression> </textField> </band>