From 6b0fa4870ae3df2b46688a71df3a764574bce848 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 21 Nov 2023 14:48:44 +0700 Subject: [PATCH] Update service slip gaji Rollback komponen gaji dari unit kerja sdm --- .../service/impl/ReportServiceImpl.java | 36 -- .../service/impl/SlipGajiServiceImpl.java | 9 +- .../WEB-INF/templates/jrxml/slipGaji.jrxml | 372 +++++------------- 3 files changed, 92 insertions(+), 325 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 52f9f1cd..613dac78 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,16 +3288,6 @@ 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())) { @@ -3338,14 +3328,6 @@ 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())); } @@ -3465,16 +3447,6 @@ 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())) { @@ -3515,14 +3487,6 @@ 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 3f5396af..b957f92c 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,11 +486,10 @@ 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("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") }); + 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("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("12") }); } TreeMap sorted = new TreeMap<>(data); Set keyset = sorted.keySet(); 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 5aa493b3..4bd732cb 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,20 +53,11 @@ - - - - - - - - - - + @@ -1017,16 +1008,6 @@ - - - - - - - - - - @@ -1061,18 +1042,8 @@ - + - - - - - - - - - - @@ -1107,18 +1078,8 @@ - + - - - - - - - - - - @@ -1153,20 +1114,8 @@ - + - - - - - - - - - - - - @@ -1202,20 +1151,8 @@ - + - - - - - - - - - - - - @@ -1251,7 +1188,7 @@ - + @@ -1344,196 +1281,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1295,7 @@ - + @@ -1558,7 +1307,7 @@ - + @@ -1570,7 +1319,7 @@ - + @@ -1585,7 +1334,7 @@ - + @@ -1596,7 +1345,7 @@ - + @@ -1609,7 +1358,7 @@ - + @@ -1624,7 +1373,7 @@ - + @@ -1640,7 +1389,7 @@ - + @@ -1651,7 +1400,7 @@ - + @@ -1664,7 +1413,7 @@ - + @@ -1674,7 +1423,7 @@ - + @@ -1690,7 +1439,7 @@ - + @@ -1701,7 +1450,7 @@ - + @@ -1714,7 +1463,7 @@ - + @@ -1729,7 +1478,7 @@ - + @@ -1740,7 +1489,7 @@ - + @@ -1754,7 +1503,7 @@ - + @@ -1769,7 +1518,7 @@ - + @@ -1780,7 +1529,7 @@ - + @@ -1791,7 +1540,7 @@ - + @@ -1801,7 +1550,7 @@ - + @@ -1812,7 +1561,7 @@ - + @@ -1823,7 +1572,7 @@ - + @@ -1834,7 +1583,7 @@ - + @@ -1845,7 +1594,7 @@ - + @@ -1855,7 +1604,7 @@ - + @@ -1866,6 +1615,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +