Merge branch 'dev/pegawai/slip-gaji' into dev/base

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;

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()));
 					}

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<Integer, Object[]> sorted = new TreeMap<>(data);
 		Set<Integer> keyset = sorted.keySet();

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 = "-";