From c60beac954d40232948eb75deecda80597d3d174 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 25 Jul 2023 19:43:49 +0700 Subject: [PATCH] Update service slip gaji Penambahan komponen jenis remunerasi tambahan dan jenis potongan bpjs --- .../medifirst2000/constants/Master.java | 7 +- .../service/impl/SlipGajiServiceImpl.java | 2 +- .../medifirst2000/dto/SlipPenerimaanDto.java | 66 ++++++++++++++----- .../medifirst2000/dto/SlipPotonganDto.java | 45 +++++++++---- 4 files changed, 89 insertions(+), 31 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 fdc02880..f204397d 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 @@ -231,7 +231,7 @@ public class Master { public static final class KomponenGaji { public static final Integer GAJI = 1; public static final Integer REMUNERASI_KINERJA = 2; - public static final Integer REMUNERASI_TAMBAHAN = 3; + public static final Integer REMUNERASI_TAMBAHAN_MANAJERIAL = 3; public static final Integer FEE_FOR_SERVICE = 4; public static final Integer FEE_FOR_ONSITE = 5; public static final Integer UANG_MAKAN = 6; @@ -248,7 +248,10 @@ public class Master { public static final Integer BIAYA_RAWAT_INAP = 17; public static final Integer BIAYA_RAWAT_JALAN = 18; public static final Integer POTONGAN_TOKO_KOPERASI = 19; - public static final Integer POTONGAN_BPJS = 20; + public static final Integer POTONGAN_BPJSK = 20; + public static final Integer POTONGAN_BPJSTK = 21; + public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22; + public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23; } public static final class KomponenHarga { 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 422ed543..94c56ce2 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 @@ -465,7 +465,7 @@ public class SlipGajiServiceImpl implements SlipGajiService { new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"), d.get("2"), d.get("3"), d.get("4"), d.get("5"), d.get("6"), d.get("7"), d.get("8"), d.get("9"), d.get("10"), d.get("11"), d.get("12"), d.get("13"), d.get("14"), d.get("15"), - d.get("16"), d.get("17"), d.get("18"), d.get("19"), d.get("20") }); + d.get("16"), d.get("17"), d.get("18"), d.get("19"), d.get("20"), d.get("21"), d.get("22"), d.get("23") }); } 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 faddbc48..5e125e1b 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 @@ -1,5 +1,5 @@ /** - * + * */ package com.jasamedika.medifirst2000.dto; @@ -16,8 +16,14 @@ public class SlipPenerimaanDto { @Caption(value = "Remunerasi Kinerja") private String remun_kinerja; - @Caption(value = "Remunerasi Tambahan") - private String remun_tambahan; + @Caption(value = "Remunerasi Tambahan Manajerial") + private String remun_tambahan_manajerial; + + @Caption(value = "Remunerasi Tambahan Pendidikan/Pelatihan/Pengajaran") + private String remun_tambahan_diklitjar; + + @Caption(value = "Remunerasi Tambahan Lain") + private String remun_tambahan_lain; @Caption(value = "Fee for Service") private String ffs; @@ -34,12 +40,14 @@ public class SlipPenerimaanDto { public SlipPenerimaanDto() { } - public SlipPenerimaanDto(String gaji, String remun_kinerja, String remun_tambahan, String ffs, String ffo, - String uang_makan, String uang_lembur) { + public SlipPenerimaanDto(String gaji, String remun_kinerja, String remun_tambahan_manajerial, String remun_tambahan_diklitjar, String remun_tambahan_lain, String ffs, + String ffo, String uang_makan, String uang_lembur) { super(); this.gaji = gaji; this.remun_kinerja = remun_kinerja; - this.remun_tambahan = remun_tambahan; + this.remun_tambahan_manajerial = remun_tambahan_manajerial; + this.remun_tambahan_diklitjar = remun_tambahan_diklitjar; + this.remun_tambahan_lain = remun_tambahan_lain; this.ffs = ffs; this.ffo = ffo; this.uang_makan = uang_makan; @@ -62,12 +70,28 @@ public class SlipPenerimaanDto { this.remun_kinerja = remun_kinerja; } - public String getRemun_tambahan() { - return remun_tambahan; + public String getRemun_tambahan_manajerial() { + return remun_tambahan_manajerial; } - public void setRemun_tambahan(String remun_tambahan) { - this.remun_tambahan = remun_tambahan; + public void setRemun_tambahan_manajerial(String remun_tambahan_manajerial) { + this.remun_tambahan_manajerial = remun_tambahan_manajerial; + } + + public String getRemun_tambahan_diklitjar() { + return remun_tambahan_diklitjar; + } + + public void setRemun_tambahan_diklitjar(String remun_tambahan_diklitjar) { + this.remun_tambahan_diklitjar = remun_tambahan_diklitjar; + } + + public String getRemun_tambahan_lain() { + return remun_tambahan_lain; + } + + public void setRemun_tambahan_lain(String remun_tambahan_lain) { + this.remun_tambahan_lain = remun_tambahan_lain; } public String getFfs() { @@ -101,7 +125,7 @@ public class SlipPenerimaanDto { public void setUang_lembur(String uang_lembur) { this.uang_lembur = uang_lembur; } - + public static SlipPenerimaanDtoBuilder builder() { return new SlipPenerimaanDtoBuilder(); } @@ -109,7 +133,9 @@ public class SlipPenerimaanDto { public static class SlipPenerimaanDtoBuilder { private String gaji = "-"; private String remun_kinerja = "-"; - private String remun_tambahan = "-"; + private String remun_tambahan_manajerial = "-"; + private String remun_tambahan_diklitjar = "-"; + private String remun_tambahan_lain = "-"; private String ffs = "-"; private String ffo = "-"; private String uang_makan = "-"; @@ -128,8 +154,18 @@ public class SlipPenerimaanDto { return this; } - public SlipPenerimaanDtoBuilder remun_tambahan(final String remun_tambahan) { - this.remun_tambahan = remun_tambahan; + public SlipPenerimaanDtoBuilder remun_tambahan_manajerial(final String remun_tambahan_manajerial) { + this.remun_tambahan_manajerial = remun_tambahan_manajerial; + return this; + } + + public SlipPenerimaanDtoBuilder remun_tambahan_diklitjar(final String remun_tambahan_diklitjar) { + this.remun_tambahan_diklitjar = remun_tambahan_diklitjar; + return this; + } + + public SlipPenerimaanDtoBuilder remun_tambahan_lain(final String remun_tambahan_lain) { + this.remun_tambahan_lain = remun_tambahan_lain; return this; } @@ -154,7 +190,7 @@ public class SlipPenerimaanDto { } public SlipPenerimaanDto build() { - return new SlipPenerimaanDto(this.gaji, this.remun_kinerja, this.remun_tambahan, this.ffs, this.ffo, + return new SlipPenerimaanDto(this.gaji, this.remun_kinerja, this.remun_tambahan_manajerial, this.remun_tambahan_diklitjar, this.remun_tambahan_lain, this.ffs, this.ffo, this.uang_makan, this.uang_lembur); } } 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 1aa721bd..9e3cb374 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 @@ -1,5 +1,5 @@ /** - * + * */ package com.jasamedika.medifirst2000.dto; @@ -46,15 +46,18 @@ public class SlipPotonganDto { @Caption(value = "Potongan Toko Koperasi") private String potongan_koperasi; - @Caption(value = "Potongan BPJS") - private String potongan_bpjs; + @Caption(value = "Potongan BPJS KESEHATAN") + private String potongan_bpjsk; + + @Caption(value = "Potongan BPJS Ketenagakerjaan") + private String potongan_bpjstk; public SlipPotonganDto() { } public SlipPotonganDto(String pph_gaji, String pph_remun, String pph_ffs, String pph_ffo, String pph_um, String pph_ul, String iuran_koperasi, String pinjam_koperasi, String biaya_obat, String biaya_ri, - String biaya_rj, String potongan_koperasi, String potongan_bpjs) { + String biaya_rj, String potongan_koperasi, String potongan_bpjsk, String potongan_bpjstk) { super(); this.pph_gaji = pph_gaji; this.pph_remun = pph_remun; @@ -68,7 +71,8 @@ public class SlipPotonganDto { this.biaya_ri = biaya_ri; this.biaya_rj = biaya_rj; this.potongan_koperasi = potongan_koperasi; - this.potongan_bpjs = potongan_bpjs; + this.potongan_bpjsk = potongan_bpjsk; + this.potongan_bpjstk = potongan_bpjstk; } public String getPph_gaji() { @@ -167,12 +171,20 @@ public class SlipPotonganDto { this.potongan_koperasi = potongan_koperasi; } - public String getPotongan_bpjs() { - return potongan_bpjs; + public String getPotongan_bpjsk() { + return potongan_bpjsk; } - public void setPotongan_bpjs(String potongan_bpjs) { - this.potongan_bpjs = potongan_bpjs; + public void setPotongan_bpjsk(String potongan_bpjsk) { + this.potongan_bpjsk = potongan_bpjsk; + } + + public String getPotongan_bpjstk() { + return potongan_bpjstk; + } + + public void setPotongan_bpjstk(String potongan_bpjstk) { + this.potongan_bpjstk = potongan_bpjstk; } public static SlipPotonganDtoBuilder builder() { @@ -192,7 +204,9 @@ public class SlipPotonganDto { private String biaya_ri = "-"; private String biaya_rj = "-"; private String potongan_koperasi = "-"; - private String potongan_bpjs = "-"; + private String potongan_bpjsk = "-"; + + private String potongan_bpjstk = "-"; public SlipPotonganDtoBuilder() { } @@ -257,15 +271,20 @@ public class SlipPotonganDto { return this; } - public SlipPotonganDtoBuilder potongan_bpjs(final String potongan_bpjs) { - this.potongan_bpjs = potongan_bpjs; + public SlipPotonganDtoBuilder potongan_bpjsk(final String potongan_bpjsk) { + this.potongan_bpjsk = potongan_bpjsk; + return this; + } + + public SlipPotonganDtoBuilder potongan_bpjstk(final String potongan_bpjstk) { + this.potongan_bpjstk = potongan_bpjstk; return this; } public SlipPotonganDto build() { return new SlipPotonganDto(this.pph_gaji, this.pph_remun, this.pph_ffs, this.pph_ffo, this.pph_um, this.pph_ul, this.iuran_koperasi, this.pinjam_koperasi, this.biaya_obat, this.biaya_ri, - this.biaya_rj, this.potongan_koperasi, this.potongan_bpjs); + this.biaya_rj, this.potongan_koperasi, this.potongan_bpjsk, this.potongan_bpjstk); } } }