salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ReportServiceImpl.java

Browse Source 
Perbaikan karena edit null value untuk nominal slip gaji
This commit is contained in:
Salman Manoe 2023-07-24 21:17:53 +07:00
parent a0569ae762
commit bddb4d41ef
1 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -3381,8 +3381,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
@Override
public List<Map<String, Object>> getHistoriUsulanRincianKegiatan(Integer idPelaksanaanTugas,
Integer idRincianKegiatan) {
return historiUsulanRincianKegiatanDao.getHistori(idPelaksanaanTugas,
idRincianKegiatan);
return historiUsulanRincianKegiatanDao.getHistori(idPelaksanaanTugas, idRincianKegiatan);
}
@Override
@ -3428,6 +3427,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
if (CommonUtil.isNotNullOrEmpty(dto.getKomponen()))
komponenDto = dto.getKomponen();
for (SlipGajiKomponenDto k : komponenDto) {
if (CommonUtil.isNotNullOrEmpty(k.getNominal())) {
if (Master.JenisKomponenGaji.PENERIMAAN.equals(k.getIdJenisKomponen())) {
jumlahPenerimaan = jumlahPenerimaan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
} else if (Master.JenisKomponenGaji.PEMOTONGAN.equals(k.getIdJenisKomponen())) {
@ -3475,6 +3475,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
result.put("potonganBpjs", nf.format(k.getNominal()));
}
}
}
result.put("jumlahPenerimaan", nf.format(jumlahPenerimaan));
result.put("jumlahPemotongan", nf.format(jumlahPemotongan));
jumlahPenerimaanBersih = jumlahPenerimaan.subtract(BigDecimal.valueOf(jumlahPemotongan.doubleValue()));