salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update service cetakan jasper

Browse Source 
Penerapan jenis remunerasi tambahan dan jenis potongan bpjs untuk cetakan slip gaji
This commit is contained in:
Salman Manoe 2023-07-25 19:45:12 +07:00
parent c60beac954
commit 21ca3b5c87
2 changed files with 990 additions and 890 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -3402,7 +3402,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("subUnitKerja", CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-"); result.put("subUnitKerja", CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-");
result.put("gaji", "-"); result.put("gaji", "-");
result.put("remunerasiKinerja", "-"); result.put("remunerasiKinerja", "-");
result.put("remunerasiTambahan", "-"); result.put("remunerasiTambahanManajerial", "-");
result.put("remunerasiTambahanDiklitjar", "-");
result.put("remunerasiTambahanLain", "-");
result.put("feeForService", "-"); result.put("feeForService", "-");
result.put("feeForOnSite", "-"); result.put("feeForOnSite", "-");
result.put("uangMakan", "-"); result.put("uangMakan", "-");
@ -3419,7 +3421,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("biayaRawatInap", "-"); result.put("biayaRawatInap", "-");
result.put("biayaRawatJalan", "-"); result.put("biayaRawatJalan", "-");
result.put("potonganTokoKoperasi", "-"); result.put("potonganTokoKoperasi", "-");
result.put("potonganBpjs", "-"); result.put("potonganBpjsK", "-");
result.put("potonganBpjsTK", "-");
BigDecimal jumlahPenerimaan = BigDecimal.ZERO; BigDecimal jumlahPenerimaan = BigDecimal.ZERO;
BigDecimal jumlahPemotongan = BigDecimal.ZERO; BigDecimal jumlahPemotongan = BigDecimal.ZERO;
BigDecimal jumlahPenerimaanBersih; BigDecimal jumlahPenerimaanBersih;
@ -3437,8 +3440,12 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("gaji", nf.format(k.getNominal())); result.put("gaji", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) {
result.put("remunerasiKinerja", nf.format(k.getNominal())); result.put("remunerasiKinerja", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_MANAJERIAL.equals(k.getIdKomponen())) {
result.put("remunerasiTambahan", nf.format(k.getNominal())); 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())) { } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
result.put("feeForService", nf.format(k.getNominal())); result.put("feeForService", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.FEE_FOR_ONSITE.equals(k.getIdKomponen())) { } 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())); result.put("biayaRawatJalan", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) {
result.put("potonganTokoKoperasi", nf.format(k.getNominal())); result.put("potonganTokoKoperasi", nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_BPJS.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
result.put("potonganBpjs", nf.format(k.getNominal())); 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())); penerimaanDtoBuilder.gaji(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) {
penerimaanDtoBuilder.remun_kinerja(nf.format(k.getNominal())); penerimaanDtoBuilder.remun_kinerja(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_MANAJERIAL.equals(k.getIdKomponen())) {
penerimaanDtoBuilder.remun_tambahan(nf.format(k.getNominal())); 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())) { } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
penerimaanDtoBuilder.ffs(nf.format(k.getNominal())); penerimaanDtoBuilder.ffs(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.FEE_FOR_ONSITE.equals(k.getIdKomponen())) { } 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())); potonganDtoBuilder.biaya_rj(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) {
potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal())); potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal()));
} else if (Master.KomponenGaji.POTONGAN_BPJS.equals(k.getIdKomponen())) { } else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal())); 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)); jumlahDtoBuilder.jumlah_gross(nf.format(jumlahPenerimaan));

1845
jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
View File

File diff suppressed because it is too large Load Diff