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 56cc6562..83de711c 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 @@ -242,6 +242,13 @@ public class SlipGajiServiceImpl implements SlipGajiService { dto.id(slipGaji.get().getId()); dto.idPegawai(slipGaji.get().getPegawai().getId()); dto.namaPegawai(slipGaji.get().getPegawai().getNamaLengkap()); + if (CommonUtil.isNotNullOrEmpty(slipGaji.get().getPegawai().getNipPns())) { + dto.nip(slipGaji.get().getPegawai().getNipPns()); + } else if (CommonUtil.isNotNullOrEmpty(slipGaji.get().getPegawai().getNip())) { + dto.nip(slipGaji.get().getPegawai().getNip()); + } else if (CommonUtil.isNotNullOrEmpty(slipGaji.get().getPegawai().getNikIntern())) { + dto.nip(slipGaji.get().getPegawai().getNikIntern()); + } dto.bulan(slipGaji.get().getBulan().getTime()); { List listDetail = slipGajiDetailDao.findBySlipGaji(slipGaji.get().getId()); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java index d3099bfb..59e99002 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java @@ -21,6 +21,9 @@ public class SlipGajiDto { @Caption(value = "Nama Pegawai") private String namaPegawai; + @Caption(value = "NIP Pegawai") + private String nip; + @Caption(value = "Jabatan") private String jabatan; @@ -42,12 +45,13 @@ public class SlipGajiDto { public SlipGajiDto() { } - public SlipGajiDto(String id, Integer idPegawai, String namaPegawai, String jabatan, String unitKerja, + public SlipGajiDto(String id, Integer idPegawai, String namaPegawai, String nip, String jabatan, String unitKerja, String subUnitKerja, String grade, Long bulan, List komponen) { super(); this.id = id; this.idPegawai = idPegawai; this.namaPegawai = namaPegawai; + this.nip = nip; this.jabatan = jabatan; this.unitKerja = unitKerja; this.subUnitKerja = subUnitKerja; @@ -80,6 +84,14 @@ public class SlipGajiDto { this.namaPegawai = namaPegawai; } + public String getNip() { + return nip; + } + + public void setNip(String nip) { + this.nip = nip; + } + public String getJabatan() { return jabatan; } @@ -140,6 +152,7 @@ public class SlipGajiDto { private String id; private Integer idPegawai; private String namaPegawai; + private String nip; private String jabatan; private String unitKerja; private String subUnitKerja; @@ -165,6 +178,11 @@ public class SlipGajiDto { return this; } + public SlipGajiDtoBuilder nip(final String nip) { + this.nip = nip; + return this; + } + public SlipGajiDtoBuilder jabatan(final String jabatan) { this.jabatan = jabatan; return this; @@ -196,7 +214,7 @@ public class SlipGajiDto { } public SlipGajiDto build() { - return new SlipGajiDto(this.id, this.idPegawai, this.namaPegawai, this.jabatan, this.unitKerja, + return new SlipGajiDto(this.id, this.idPegawai, this.namaPegawai, this.nip, this.jabatan, this.unitKerja, this.subUnitKerja, this.grade, this.bulan, this.komponen); } }