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

Update SlipGajiServiceImpl.java

Browse Source 
Perbaikan validasi null existing slip gaji
This commit is contained in:
Salman Manoe 2023-04-26 08:08:02 +07:00
parent 29247ed49d
commit a4e4fdaca8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
View File

@ -144,7 +144,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
Date start = DateUtil.startMonth(month); Date start = DateUtil.startMonth(month);
Date end = DateUtil.endMonth(month); Date end = DateUtil.endMonth(month);
Optional<SlipGaji> existedSlipGaji = slipGajiDao.findByPegawaiAndBulan(dto.getIdPegawai(), start, end); Optional<SlipGaji> existedSlipGaji = slipGajiDao.findByPegawaiAndBulan(dto.getIdPegawai(), start, end);
if (existedSlipGaji.isPresent()) { if (CommonUtil.isNotNullOrEmpty(existedSlipGaji) && existedSlipGaji.isPresent()) {
slipGaji.id(existedSlipGaji.get().getId()); slipGaji.id(existedSlipGaji.get().getId());
} else if (CommonUtil.isNotNullOrEmpty(dto.getId())) { } else if (CommonUtil.isNotNullOrEmpty(dto.getId())) {
slipGaji.id(dto.getId()); slipGaji.id(dto.getId());
@ -153,7 +153,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
slipGaji.bulan(month); slipGaji.bulan(month);
SlipGaji savedSlip = slipGajiDao.save(slipGaji.build()); SlipGaji savedSlip = slipGajiDao.save(slipGaji.build());
if (CommonUtil.isNotNullOrEmpty(savedSlip)) { if (CommonUtil.isNotNullOrEmpty(savedSlip)) {
if (!existedSlipGaji.isPresent() && CommonUtil.isNullOrEmpty(dto.getId())) { if (CommonUtil.isNullOrEmpty(existedSlipGaji) && CommonUtil.isNullOrEmpty(dto.getId())) {
List<MapPegawaiJabatanToUnitKerja> listMapping = mappingJabatanDao.findByPegawaiId(dto.getIdPegawai()); List<MapPegawaiJabatanToUnitKerja> listMapping = mappingJabatanDao.findByPegawaiId(dto.getIdPegawai());
List<SlipGajiDetail> listDetail = new ArrayList<>(); List<SlipGajiDetail> listDetail = new ArrayList<>();
listMapping.forEach(j -> { listMapping.forEach(j -> {