diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 96d5d3c9..5e724489 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -180,6 +180,8 @@ public final class Master { } public static final class KomponenGaji { + public static final Integer FEE_FOR_ON_SITE = 5; + public static final Integer FEE_FOR_SERVICE = 4; public static final Integer GAJI_POKOK = 1; public static final Integer SIMPANAN_WAJIB_KOPERASI_GAJI = 14; public static final Integer SIMPANAN_WAJIB_KOPERASI_REMUNERASI = 38; @@ -190,15 +192,21 @@ public final class Master { public static final Integer POTONGAN_BPJSTK = 21; public static final Integer POTONGAN_LAIN = 33; public static final Integer POTONGAN_OBAT = 16; - public static final Integer POTONGAN_PPH_21_REMUNERASI = 9; - public static final Integer POTONGAN_PPH_21_REMUNERASI_OPERASIONAL = 10; + public static final Integer POTONGAN_PPH_21_REMUNERASI = 36; + public static final Integer POTONGAN_PPH_21_REMUNERASI_OPERASIONAL = 37; public static final Integer POTONGAN_PPH_21_UANG_MAKAN = 12; public static final Integer POTONGAN_RAWAT_INAP = 17; public static final Integer POTONGAN_RAWAT_JALAN = 18; public static final Integer PFK = 31; public static final Integer PPH = 8; + public static final Integer PPH_FEE_FOR_ON_SITE = 11; + public static final Integer PPH_FEE_FOR_SERVICE = 10; + public static final Integer PPH_REMUNERASI = 9; + public static final Integer PPH_UANG_LEMBUR = 13; public static final Integer REMUNERASI = 2; public static final Integer REMUNERASI_OPERASIONAL = 3; + public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22; + public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23; public static final Integer SEWA_RUMAH = 32; public static final Integer TABUNGAN_RUMAH = 34; public static final Integer TOKO_KOPERASI = 19; @@ -209,6 +217,7 @@ public final class Master { public static final Integer TUNJANGAN_PNS = 26; public static final Integer TUNJANGAN_PPH = 30; public static final Integer TUNJANGAN_STRUKTURAL = 27; + public static final Integer UANG_LEMBUR = 7; public static final Integer UANG_MAKAN = 6; public static final Integer WAKAF_DLL = 39; } 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 613dac78..52f9f1cd 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 @@ -3288,6 +3288,16 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("remunerasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { result.put("remunerasiOperasional", 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_ON_SITE.equals(k.getIdKomponen())) { + result.put("feeForOnSite", 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.UANG_LEMBUR.equals(k.getIdKomponen())) { + result.put("uangLembur", nf.format(k.getNominal())); } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { result.put("uangMakan", nf.format(k.getNominal())); } else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) { @@ -3328,6 +3338,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("tokoKoperasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { result.put("wakafDanLainLain", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) { + result.put("pphRemunerasi", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + result.put("pphFeeForService", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + result.put("pphFeeForOnSite", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) { + result.put("pphUangLembur", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) { result.put("potonganPph21UangMakan", nf.format(k.getNominal())); } @@ -3447,6 +3465,16 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic penerimaanDtoBuilder.remunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.feeForService(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.feeForOnSite(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remunerasiTambahanDiklitjar(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.remunerasiTambahanLain(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) { + penerimaanDtoBuilder.uangLembur(nf.format(k.getNominal())); } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { penerimaanDtoBuilder.uangMakan(nf.format(k.getNominal())); } else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) { @@ -3487,6 +3515,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.tokoKoperasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { potonganDtoBuilder.wakafDanLainLain(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphRemunerasi(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphFeeForService(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_FEE_FOR_ON_SITE.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphFeeForOnSite(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) { + potonganDtoBuilder.pphUangLembur(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPph21UangMakan(nf.format(k.getNominal())); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java index f2a57889..3f5396af 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java @@ -486,10 +486,11 @@ public class SlipGajiServiceImpl implements SlipGajiService { data.put(i++, new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"), d.get("24"), d.get("25"), d.get("26"), d.get("27"), d.get("28"), d.get("29"), d.get("30"), - d.get("2"), d.get("3"), d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"), - d.get("33"), d.get("34"), d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("9"), - d.get("10"), d.get("16"), d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"), - d.get("39"), d.get("12") }); + d.get("2"), d.get("3"), d.get("4"), d.get("5"), d.get("22"), d.get("23"), d.get("7"), + d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"), d.get("33"), d.get("34"), + d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("36"), d.get("37"), d.get("16"), + d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"), d.get("39"), d.get("9"), + d.get("10"), d.get("11"), d.get("13"), d.get("12") }); } TreeMap sorted = new TreeMap<>(data); Set keyset = sorted.keySet(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java index 3c909735..a77de902 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java @@ -53,6 +53,26 @@ public class SlipPenerimaanDto { @Builder.Default private String remunerasiOperasional = "-"; + @Caption(value = "Fee for Service") + @Builder.Default + private String feeForService = "-"; + + @Caption(value = "Fee for On Site") + @Builder.Default + private String feeForOnSite = "-"; + + @Caption(value = "Remunerasi Tambahan Pendidikan/Pelatihan/Pengajaran") + @Builder.Default + private String remunerasiTambahanDiklitjar = "-"; + + @Caption(value = "Remunerasi Tambahan Lain") + @Builder.Default + private String remunerasiTambahanLain = "-"; + + @Caption(value = "Uang Lembur") + @Builder.Default + private String uangLembur = "-"; + @Caption(value = "Uang Makan") @Builder.Default private String uangMakan = "-"; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java index 4072421f..d4fa292a 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java @@ -85,10 +85,26 @@ public class SlipPotonganDto { @Builder.Default private String tokoKoperasi = "-"; - @Caption(value = "Wakap Dan Lain-lain") + @Caption(value = "Wakaf Dan Lain-lain") @Builder.Default private String wakafDanLainLain = "-"; + @Caption(value = "PPH Remunerasi") + @Builder.Default + private String pphRemunerasi = "-"; + + @Caption(value = "PPH Fee for Service") + @Builder.Default + private String pphFeeForService = "-"; + + @Caption(value = "PPH Fee for On Site") + @Builder.Default + private String pphFeeForOnSite = "-"; + + @Caption(value = "PPH Uang Lembur") + @Builder.Default + private String pphUangLembur = "-"; + @Caption(value = "Potongan PPH 21 Uang Makan") @Builder.Default private String potonganPph21UangMakan = "-"; 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 73df9bb9..e08a5147 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 @@ -53,11 +53,20 @@ + + + + + + + + + - + @@ -87,7 +96,7 @@ - + @@ -97,7 +106,7 @@ - + @@ -107,7 +116,7 @@ - + @@ -118,7 +127,7 @@ - + @@ -128,7 +137,7 @@ - + @@ -139,7 +148,7 @@ - + @@ -150,7 +159,7 @@ - + @@ -158,7 +167,7 @@ - + @@ -166,7 +175,7 @@ - + @@ -175,8 +184,9 @@ - + + @@ -185,7 +195,7 @@ - + @@ -195,7 +205,7 @@ - + @@ -206,7 +216,7 @@ - + @@ -220,7 +230,7 @@ - + @@ -234,7 +244,7 @@ - + @@ -248,7 +258,7 @@ - + @@ -256,7 +266,7 @@ - + @@ -264,7 +274,7 @@ - + @@ -1060,18 +1070,7 @@ - - - - - - - - - - - - + @@ -1094,6 +1093,16 @@ + + + + + + + + + + @@ -1109,18 +1118,7 @@ - - - - - - - - - - - - + @@ -1143,6 +1141,16 @@ + + + + + + + + + + @@ -1158,18 +1166,7 @@ - - - - - - - - - - - - + @@ -1192,6 +1189,16 @@ + + + + + + + + + + @@ -1207,18 +1214,7 @@ - - - - - - - - - - - - + @@ -1242,6 +1238,18 @@ + + + + + + + + + + + + @@ -1257,18 +1265,7 @@ - - - - - - - - - - - - + @@ -1292,6 +1289,18 @@ + + + + + + + + + + + + @@ -1390,7 +1399,203 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1405,7 +1610,7 @@ - + @@ -1417,7 +1622,7 @@ - + @@ -1429,7 +1634,7 @@ - + @@ -1444,7 +1649,7 @@ - + @@ -1459,7 +1664,7 @@ - + @@ -1472,7 +1677,7 @@ - + @@ -1485,7 +1690,7 @@ - + @@ -1503,7 +1708,7 @@ - + @@ -1519,7 +1724,7 @@ - + @@ -1529,7 +1734,7 @@ - + @@ -1542,7 +1747,7 @@ - + @@ -1555,7 +1760,7 @@ - + @@ -1570,7 +1775,7 @@ - + @@ -1583,7 +1788,7 @@ - + @@ -1596,7 +1801,7 @@ - + @@ -1611,7 +1816,7 @@ - + @@ -1625,7 +1830,7 @@ - + @@ -1638,7 +1843,7 @@ - + @@ -1651,7 +1856,7 @@ - + @@ -1661,7 +1866,7 @@ - + @@ -1674,7 +1879,7 @@ - + @@ -1685,7 +1890,7 @@ - + @@ -1698,7 +1903,7 @@ - + @@ -1709,7 +1914,7 @@ - + @@ -1722,7 +1927,7 @@ - + @@ -1733,7 +1938,7 @@ - +