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 2dcdea2a..bfa1e99a 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 @@ -3207,29 +3207,38 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("periode", df.format(new Date(bulan))); result.put("unitKerja", CommonUtil.isNotNullOrEmpty(dto.getUnitKerja()) ? dto.getUnitKerja() : "-"); result.put("subUnitKerja", CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-"); + result.put("statusKepegawaian", + CommonUtil.isNotNullOrEmpty(dto.getStatusKepegawaian()) ? dto.getStatusKepegawaian() : "-"); result.put("gajiPokok", "-"); result.put("tunjanganIstriSuami", "-"); result.put("tunjanganAnak", "-"); - result.put("tunjanganPns", "-"); + result.put("tunjanganUmum", "-"); result.put("tunjanganStruktural", "-"); result.put("tunjanganFungsional", "-"); result.put("tunjanganBeras", "-"); result.put("tunjanganPph", "-"); - result.put("remunerasi", "-"); + result.put("tunjanganKompensasi", "-"); + result.put("pembulatan", "-"); + result.put("remunerasiKinerja", "-"); + result.put("feeForService", "-"); result.put("remunerasiOperasional", "-"); + result.put("kelebihanJamKerja", "-"); + result.put("remunerasiManajerial", "-"); + result.put("remunerasiTambahanDiklitjar", "-"); + result.put("remunerasiTambahanLain", "-"); result.put("uangMakan", "-"); - result.put("pfk", "-"); - result.put("pph", "-"); + result.put("potonganPfk", "-"); + result.put("potonganPph", "-"); + result.put("potonganBpjsKetenagakerjaan", "-"); + result.put("potonganBpjsKesehatan", "-"); result.put("sewaRumah", "-"); result.put("kelebihanTunjangan", "-"); result.put("potonganLain", "-"); result.put("tabunganRumah", "-"); - result.put("potonganBpjsKetenagakerjaan", "-"); - result.put("potonganBpjsKesehatan", "-"); result.put("simpananWajibKoperasiGaji", "-"); result.put("pinjamanKoperasiGaji", "-"); - result.put("potonganPph21Remunerasi", "-"); - result.put("potonganPph21RemunerasiOperasional", "-"); + result.put("potonganPphRemunerasi", "-"); + result.put("potonganPphRemunerasiOperasional", "-"); result.put("potonganObat", "-"); result.put("potonganRawatInap", "-"); result.put("potonganRawatJalan", "-"); @@ -3237,7 +3246,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiRemunerasi", "-"); result.put("tokoKoperasi", "-"); result.put("wakafDanLainLain", "-"); - result.put("potonganPph21UangMakan", "-"); + result.put("potonganUangMakan", "-"); BigDecimal jumlahGaji = ZERO; BigDecimal jumlahRemunerasi = ZERO; BigDecimal jumlahUangMakan = ZERO; @@ -3305,7 +3314,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic } else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) { result.put("uangMakan", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PFK.equals(k.getIdKomponen())) { - result.put("potongaPfk", nf.format(k.getNominal())); + result.put("potonganPfk", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH.equals(k.getIdKomponen())) { result.put("potonganPph", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) { 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 3e6f9fc3..d3f7e43b 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 @@ -507,7 +507,8 @@ public class SlipGajiServiceImpl implements SlipGajiService { int cellnum = 0; for (Object obj : objArr) { Cell cell = row.createCell(cellnum++); - cell.setCellStyle(defaultCellStyle); + if (row.getRowNum() != 0 && cell.getColumnIndex() > 1) + cell.setCellStyle(defaultCellStyle); if (obj instanceof String) cell.setCellValue((String) obj); else if (obj instanceof Integer) 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 2635eddf..7ad5ab64 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 @@ -364,6 +364,7 @@ + @@ -376,7 +377,9 @@ - + + + @@ -387,7 +390,9 @@ - + + + @@ -400,7 +405,7 @@ - +