From 8130807d0aa803f80421011504ad3a120b952e5e Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 16 Feb 2024 19:06:35 +0700 Subject: [PATCH] Update service slip gaji Penambahan komponen potongan pinjaman BRI di fitur pengaturan data penghasilan dan cetakan slip gaji --- .../medifirst2000/constants/Master.java | 2 + .../service/impl/ReportServiceImpl.java | 10 + .../service/impl/SlipGajiServiceImpl.java | 4 +- .../medifirst2000/dto/SlipPotonganDto.java | 8 + .../WEB-INF/templates/jrxml/slipGaji.jrxml | 273 +++++++++++++----- 5 files changed, 218 insertions(+), 79 deletions(-) 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 d0d72d1a..45f1766d 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 @@ -204,6 +204,8 @@ public final class Master { public static final Integer KELEBIHAN_JAM_KERJA = 43; public static final Integer KELEBIHAN_TUNJANGAN = 40; public static final Integer PEMBULATAN = 42; + public static final Integer PINJAMAM_BRI_GAJI = 45; + public static final Integer PINJAMAN_BRI_REMUNERASI = 46; public static final Integer PINJAMAN_KOPERASI_GAJI = 15; public static final Integer PINJAMAN_KOPERASI_REMUNERASI = 35; public static final Integer POTONGAN_BPJSK = 20; 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 f8170f95..a94497df 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 @@ -3237,6 +3237,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("simpananWajibKoperasiGaji", "-"); result.put("pinjamanKoperasiGaji", "-"); result.put("potonganPphRemunerasi", "-"); + result.put("pinjamanBriGaji","-"); result.put("potonganObat", "-"); result.put("potonganRawatInap", "-"); result.put("potonganRawatJalan", "-"); @@ -3244,6 +3245,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiRemunerasi", "-"); result.put("tokoKoperasi", "-"); result.put("wakafDanLainLain", "-"); + result.put("pinjamanBriRemunerasi", "-"); result.put("potonganUangMakan", "-"); BigDecimal jumlahGaji = ZERO; BigDecimal jumlahRemunerasi = ZERO; @@ -3331,6 +3333,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiGaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { result.put("potonganPphRemunerasi", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PINJAMAM_BRI_GAJI.equals(k.getIdKomponen())) { + result.put("pinjamanBriGaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { result.put("potonganObat", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) { @@ -3345,6 +3349,8 @@ 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.PINJAMAN_BRI_REMUNERASI.equals(k.getIdKomponen())) { + result.put("pinjamanBriRemunerasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdKomponen())) { result.put("potonganUangMakan", nf.format(k.getNominal())); } @@ -3500,6 +3506,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.simpananWajibKoperasiGaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.PINJAMAN_KOPERASI_GAJI.equals(k.getIdKomponen())) { potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PINJAMAM_BRI_GAJI.equals(k.getIdKomponen())) { + potonganDtoBuilder.pinjamanBriGaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { @@ -3516,6 +3524,8 @@ 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.PINJAMAN_BRI_REMUNERASI.equals(k.getIdKomponen())) { + potonganDtoBuilder.pinjamanBriRemunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganUangMakan(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 8d2a0171..32f57b39 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 @@ -497,8 +497,8 @@ public class SlipGajiServiceImpl implements SlipGajiService { d.get("28"), d.get("29"), d.get("30"), d.get("41"), d.get("42"), d.get("2"), d.get("4"), d.get("3"), d.get("43"), d.get("44"), d.get("22"), d.get("23"), d.get("6"), d.get("31"), d.get("8"), d.get("21"), d.get("20"), d.get("32"), d.get("40"), d.get("33"), d.get("34"), - 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") }); + d.get("14"), d.get("15"), d.get("45"), 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("46"), d.get("12") }); } TreeMap sorted = new TreeMap<>(data); Set keyset = sorted.keySet(); 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 bfb15512..df086bc2 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 @@ -53,6 +53,10 @@ public class SlipPotonganDto { @Builder.Default private String pinjamanKoperasiGaji = "-"; + @Caption(value = "Pinjaman BRI (Gaji)") + @Builder.Default + private String pinjamanBriGaji = "-"; + @Caption(value = "Potongan PPH Remunerasi") @Builder.Default private String potonganPphRemunerasi = "-"; @@ -85,6 +89,10 @@ public class SlipPotonganDto { @Builder.Default private String wakafDanLainLain = "-"; + @Caption(value = "Pinjaman BRI (Remunerasi)") + @Builder.Default + private String pinjamanBriRemunerasi = "-"; + @Caption(value = "Potongan Uang Makan") @Builder.Default private String potonganUangMakan = "-"; 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 21290ed7..6a0719a2 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 @@ -59,11 +59,13 @@ + + - - + + @@ -818,7 +820,7 @@ - + @@ -831,7 +833,7 @@ - + @@ -843,7 +845,7 @@ - + @@ -855,7 +857,7 @@ - + @@ -870,7 +872,7 @@ - + @@ -883,7 +885,7 @@ - + @@ -898,7 +900,7 @@ - + @@ -914,7 +916,7 @@ - + @@ -925,7 +927,7 @@ - + @@ -938,7 +940,7 @@ - + @@ -948,7 +950,7 @@ - + @@ -964,7 +966,7 @@ - + @@ -974,7 +976,7 @@ - + @@ -985,7 +987,7 @@ - + @@ -1000,7 +1002,7 @@ - + @@ -1010,7 +1012,7 @@ - + @@ -1021,7 +1023,7 @@ - + @@ -1036,7 +1038,7 @@ - + @@ -1046,7 +1048,7 @@ - + @@ -1057,7 +1059,7 @@ - + @@ -1072,7 +1074,7 @@ - + @@ -1084,7 +1086,7 @@ - + @@ -1094,7 +1096,7 @@ - + @@ -1110,7 +1112,7 @@ - + @@ -1122,7 +1124,7 @@ - + @@ -1132,7 +1134,7 @@ - + @@ -1148,7 +1150,7 @@ - + @@ -1158,7 +1160,7 @@ - + @@ -1166,7 +1168,7 @@ - + @@ -1182,7 +1184,7 @@ - + @@ -1192,7 +1194,7 @@ - + @@ -1203,7 +1205,7 @@ - + @@ -1214,7 +1216,7 @@ - + @@ -1229,7 +1231,7 @@ - + @@ -1242,7 +1244,7 @@ - + @@ -1254,7 +1256,7 @@ - + @@ -1266,7 +1268,7 @@ - + @@ -1281,7 +1283,7 @@ - + @@ -1294,7 +1296,7 @@ - + @@ -1309,7 +1311,7 @@ - + @@ -1325,7 +1327,7 @@ - + @@ -1336,7 +1338,7 @@ - + @@ -1349,7 +1351,7 @@ - + @@ -1359,7 +1361,7 @@ - + @@ -1375,7 +1377,7 @@ - + @@ -1388,7 +1390,7 @@ - + @@ -1403,7 +1405,7 @@ - + @@ -1417,7 +1419,7 @@ - + @@ -1432,7 +1434,7 @@ - + @@ -1443,7 +1445,7 @@ - + @@ -1454,7 +1456,7 @@ - + @@ -1464,7 +1466,7 @@ - + @@ -1475,7 +1477,7 @@ - + @@ -1486,7 +1488,7 @@ - + @@ -1497,7 +1499,7 @@ - + @@ -1508,7 +1510,7 @@ - + @@ -1518,7 +1520,7 @@ - + @@ -1529,7 +1531,7 @@ - + @@ -1542,7 +1544,7 @@ - + @@ -1555,7 +1557,7 @@ - + @@ -1568,7 +1570,7 @@ - + @@ -1582,7 +1584,7 @@ - + @@ -1598,7 +1600,7 @@ - + @@ -1614,7 +1616,7 @@ - + @@ -1630,7 +1632,7 @@ - + @@ -1644,7 +1646,7 @@ - + @@ -1659,7 +1661,7 @@ - + @@ -1670,7 +1672,7 @@ - + @@ -1706,7 +1708,7 @@ - + @@ -1716,7 +1718,7 @@ - + @@ -1724,7 +1726,7 @@ - + @@ -1732,7 +1734,7 @@ - + @@ -1740,7 +1742,7 @@ - + @@ -1748,7 +1750,7 @@ - + @@ -1762,7 +1764,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + +