Update service slip gaji
Penambahan informasi NIP pegawai
This commit is contained in:
parent
13065f98a3
commit
036a6860d6
@ -242,6 +242,13 @@ public class SlipGajiServiceImpl implements SlipGajiService {
|
|||||||
dto.id(slipGaji.get().getId());
|
dto.id(slipGaji.get().getId());
|
||||||
dto.idPegawai(slipGaji.get().getPegawai().getId());
|
dto.idPegawai(slipGaji.get().getPegawai().getId());
|
||||||
dto.namaPegawai(slipGaji.get().getPegawai().getNamaLengkap());
|
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());
|
dto.bulan(slipGaji.get().getBulan().getTime());
|
||||||
{
|
{
|
||||||
List<SlipGajiDetail> listDetail = slipGajiDetailDao.findBySlipGaji(slipGaji.get().getId());
|
List<SlipGajiDetail> listDetail = slipGajiDetailDao.findBySlipGaji(slipGaji.get().getId());
|
||||||
|
|||||||
@ -21,6 +21,9 @@ public class SlipGajiDto {
|
|||||||
@Caption(value = "Nama Pegawai")
|
@Caption(value = "Nama Pegawai")
|
||||||
private String namaPegawai;
|
private String namaPegawai;
|
||||||
|
|
||||||
|
@Caption(value = "NIP Pegawai")
|
||||||
|
private String nip;
|
||||||
|
|
||||||
@Caption(value = "Jabatan")
|
@Caption(value = "Jabatan")
|
||||||
private String jabatan;
|
private String jabatan;
|
||||||
|
|
||||||
@ -42,12 +45,13 @@ public class SlipGajiDto {
|
|||||||
public 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<SlipGajiKomponenDto> komponen) {
|
String subUnitKerja, String grade, Long bulan, List<SlipGajiKomponenDto> komponen) {
|
||||||
super();
|
super();
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.idPegawai = idPegawai;
|
this.idPegawai = idPegawai;
|
||||||
this.namaPegawai = namaPegawai;
|
this.namaPegawai = namaPegawai;
|
||||||
|
this.nip = nip;
|
||||||
this.jabatan = jabatan;
|
this.jabatan = jabatan;
|
||||||
this.unitKerja = unitKerja;
|
this.unitKerja = unitKerja;
|
||||||
this.subUnitKerja = subUnitKerja;
|
this.subUnitKerja = subUnitKerja;
|
||||||
@ -80,6 +84,14 @@ public class SlipGajiDto {
|
|||||||
this.namaPegawai = namaPegawai;
|
this.namaPegawai = namaPegawai;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getNip() {
|
||||||
|
return nip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNip(String nip) {
|
||||||
|
this.nip = nip;
|
||||||
|
}
|
||||||
|
|
||||||
public String getJabatan() {
|
public String getJabatan() {
|
||||||
return jabatan;
|
return jabatan;
|
||||||
}
|
}
|
||||||
@ -140,6 +152,7 @@ public class SlipGajiDto {
|
|||||||
private String id;
|
private String id;
|
||||||
private Integer idPegawai;
|
private Integer idPegawai;
|
||||||
private String namaPegawai;
|
private String namaPegawai;
|
||||||
|
private String nip;
|
||||||
private String jabatan;
|
private String jabatan;
|
||||||
private String unitKerja;
|
private String unitKerja;
|
||||||
private String subUnitKerja;
|
private String subUnitKerja;
|
||||||
@ -165,6 +178,11 @@ public class SlipGajiDto {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SlipGajiDtoBuilder nip(final String nip) {
|
||||||
|
this.nip = nip;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public SlipGajiDtoBuilder jabatan(final String jabatan) {
|
public SlipGajiDtoBuilder jabatan(final String jabatan) {
|
||||||
this.jabatan = jabatan;
|
this.jabatan = jabatan;
|
||||||
return this;
|
return this;
|
||||||
@ -196,7 +214,7 @@ public class SlipGajiDto {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public SlipGajiDto build() {
|
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);
|
this.subUnitKerja, this.grade, this.bulan, this.komponen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user