From 21ca3b5c87587d05ba536de83502df52b873cab8 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 25 Jul 2023 19:45:12 +0700 Subject: [PATCH] Update service cetakan jasper Penerapan jenis remunerasi tambahan dan jenis potongan bpjs untuk cetakan slip gaji --- .../service/impl/ReportServiceImpl.java | 35 +- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 1845 +++++++++-------- 2 files changed, 990 insertions(+), 890 deletions(-) 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 b09f1008..ce23ef8d 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 @@ -3402,7 +3402,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("subUnitKerja", CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-"); result.put("gaji", "-"); result.put("remunerasiKinerja", "-"); - result.put("remunerasiTambahan", "-"); + result.put("remunerasiTambahanManajerial", "-"); + result.put("remunerasiTambahanDiklitjar", "-"); + result.put("remunerasiTambahanLain", "-"); result.put("feeForService", "-"); result.put("feeForOnSite", "-"); result.put("uangMakan", "-"); @@ -3419,7 +3421,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("biayaRawatInap", "-"); result.put("biayaRawatJalan", "-"); result.put("potonganTokoKoperasi", "-"); - result.put("potonganBpjs", "-"); + result.put("potonganBpjsK", "-"); + result.put("potonganBpjsTK", "-"); BigDecimal jumlahPenerimaan = BigDecimal.ZERO; BigDecimal jumlahPemotongan = BigDecimal.ZERO; BigDecimal jumlahPenerimaanBersih; @@ -3437,8 +3440,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("gaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) { result.put("remunerasiKinerja", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN.equals(k.getIdKomponen())) { - result.put("remunerasiTambahan", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_MANAJERIAL.equals(k.getIdKomponen())) { + result.put("remunerasiTambahanManajerial", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { + result.put("remunerasiTambahanDiklitjar", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { + result.put("remunerasiTambahanLain", nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { result.put("feeForService", nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_ONSITE.equals(k.getIdKomponen())) { @@ -3471,8 +3478,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("biayaRawatJalan", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) { result.put("potonganTokoKoperasi", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.POTONGAN_BPJS.equals(k.getIdKomponen())) { - result.put("potonganBpjs", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) { + result.put("potonganBpjsK", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) { + result.put("potonganBpjsTK", nf.format(k.getNominal())); } } } @@ -3538,8 +3547,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic penerimaanDtoBuilder.gaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) { penerimaanDtoBuilder.remun_kinerja(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.remun_tambahan(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_MANAJERIAL.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remun_tambahan_manajerial(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remun_tambahan_diklitjar(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remun_tambahan_lain(nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { penerimaanDtoBuilder.ffs(nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_ONSITE.equals(k.getIdKomponen())) { @@ -3572,8 +3585,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.biaya_rj(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) { potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.POTONGAN_BPJS.equals(k.getIdKomponen())) { - potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) { + potonganDtoBuilder.potongan_bpjsk(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) { + potonganDtoBuilder.potongan_bpjstk(nf.format(k.getNominal())); } } jumlahDtoBuilder.jumlah_gross(nf.format(jumlahPenerimaan)); diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 0a895942..5827a9f0 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -1,6 +1,15 @@ - + + + + + + + + + + @@ -11,7 +20,7 @@ - + @@ -32,891 +41,967 @@ - + + + + - <band height="71" splitType="Stretch"> - <elementGroup> - <staticText> - <reportElement stretchType="ElementGroupHeight" x="400" y="0" width="272" height="53" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76"> - <property name="com.jaspersoft.studio.unit.height" value="px"/> - <property name="com.jaspersoft.studio.unit.width" value="px"/> - <property name="com.jaspersoft.studio.unit.x" value="px"/> - </reportElement> - <textElement textAlignment="Right"> - <font size="12"/> - </textElement> - <text><![CDATA[SLIP GAJI]]></text> - </staticText> - <image> - <reportElement stretchType="ElementGroupHeight" x="0" y="0" width="400" height="53" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1"/> - <imageExpression><![CDATA["../images/logoHarkit.png"]]></imageExpression> - </image> - </elementGroup> - <elementGroup> - <staticText> - <reportElement stretchType="ElementGroupHeight" x="0" y="53" width="672" height="18" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb"/> - <box> - <bottomPen lineWidth="1.0" lineStyle="Solid"/> - </box> - <textElement textAlignment="Left" verticalAlignment="Top"/> - <text><![CDATA[Jl. Letjend. S. Parman Kav. 87, Slipi,Jakarta Barat 11420 – Indonesia, Telp 021 5668284]]></text> - </staticText> - </elementGroup> + <band height="60" splitType="Stretch"> + <staticText> + <reportElement x="440" y="0" width="262" height="42" isPrintWhenDetailOverflows="true" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76"> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="com.jaspersoft.studio.unit.x" value="px"/> + </reportElement> + <textElement textAlignment="Right"> + <font size="12"/> + </textElement> + <text><![CDATA[SLIP GAJI]]></text> + </staticText> + <staticText> + <reportElement x="0" y="42" width="702" height="18" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb"/> + <box> + <bottomPen lineWidth="1.0" lineStyle="Solid"/> + </box> + <textElement textAlignment="Left" verticalAlignment="Top"/> + <text><![CDATA[Jl. Letjend. S. Parman Kav. 87, Slipi,Jakarta Barat 11420 – Indonesia, Telp 021 5668284]]></text> + </staticText> + <image> + <reportElement x="0" y="0" width="440" height="42" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1"> + <property name="com.jaspersoft.studio.unit.width" value="px"/> + <property name="com.jaspersoft.studio.unit.height" value="px"/> + </reportElement> + <imageExpression><![CDATA["../images/logoHarkit.png"]]></imageExpression> + </image> </band> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +