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 72dc320f..2891cae5 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 @@ -197,6 +197,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; @@ -207,15 +209,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; @@ -226,6 +234,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 1e4f8f9c..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 @@ -1929,8 +1929,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -1953,8 +1954,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -2138,8 +2140,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; @@ -2162,8 +2165,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } } else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId) || Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) { - if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) - .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { + if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan")) + && Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA) + .contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) { String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1"); String[] arrCutiA1 = cutiA1.split("_"); labelTtdMenkes = arrCutiA1[0]; 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..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 @@ -487,8 +487,8 @@ public class SlipGajiServiceImpl implements SlipGajiService { 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("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); 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 416c2a06..94582df8 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,5 +1,5 @@ - + @@ -57,16 +57,16 @@ - + - + - + @@ -77,300 +77,345 @@ - + - + - - + + + - + - - + + + + + + + + + + + + - - + + + - + - - - - - - - - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - - + + + + + - + + + + + + + + + + - - - + + + + + + + - + - - + + - - - + + + - + + + + + + + + + + - - - + - - + + + - + - - - - + + + + + + + + + + + + + + + + - - + + + - + - - - - - + + + + - + - - - - - - - + + + + + - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + - + + + - + - + - + + - + - - + + - - - + - + - + - - - + + - + - + - - - + + - + + + - + - + - + + + - + - - + + - - - + - + - + - - - + + @@ -380,46 +425,45 @@ - + - + - - - - - + + + + - + - + - + + + - + - + + - - - + - + - + - - - + + @@ -428,46 +472,45 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + @@ -476,45 +519,46 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + - - - - - - - - - - - - @@ -522,45 +566,44 @@ - + - + - - - - - + + + + - + - + - + + + - + - + + + + + + + + + + + - - - - - - - - - - - - @@ -568,48 +611,47 @@ - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + - - - - - - - - - - - - @@ -617,59 +659,46 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -677,35 +706,47 @@ - + - - - - - - - - - + - + - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -713,632 +754,127 @@ - + - - - - - - - - - - - - - - - - - - - + - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + - - - - - - - - - - - - - - - + + - + - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1346,54 +882,64 @@ - + - + - - - + + + + + + + + + + + + + + + + - + - + - - + - + - - - + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + @@ -1402,51 +948,491 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + @@ -1454,40 +1440,28 @@ - + - + - + - + - + - + - - - - - - - - - - - - @@ -1495,131 +1469,216 @@ - + - - - - - - - - - - - - - - - - + - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -