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

Update SlipGajiServiceImpl.java

Browse Source
This commit is contained in:
Salman Manoe 2023-06-23 10:31:39 +07:00
parent ce44cbd071
commit 137e41a983
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,11 +258,16 @@ public class SlipGajiServiceImpl implements SlipGajiService {
SlipGaji slipGaji = slipGajiBuilder.build();
listSlip.add(slipGaji);
List<SlipGajiKomponenDto> komponen = e.getKomponen();
List<SlipGajiKomponen> komponenSlip = allKomponen.stream().filter(k -> e.getId().equals(k.getSlipGaji().getId())).collect(Collectors.toList());
List<Integer> listIdMasterKomponen = komponenSlip.stream().map(k -> k.getKomponen().getId()).collect(Collectors.toList());
List<SlipGajiKomponen> komponenSlip = allKomponen.stream()
.filter(k -> e.getId().equals(k.getSlipGaji().getId())).collect(Collectors.toList());
List<Integer> listIdMasterKomponen = komponenSlip.stream().map(k -> k.getKomponen().getId())
.collect(Collectors.toList());
komponen.forEach(k -> {
if (CommonUtil.isNotNullOrEmpty(k.getNominal()) && listIdMasterKomponen.contains(k.getIdKomponen())) {
List<SlipGajiKomponen> komponenList = komponenSlip.stream().filter(s -> s.getKomponen().getId().equals(k.getIdKomponen())).collect(Collectors.toList());
if (CommonUtil.isNotNullOrEmpty(k.getNominal())
&& listIdMasterKomponen.contains(k.getIdKomponen())) {
List<SlipGajiKomponen> komponenList = komponenSlip.stream()
.filter(s -> s.getKomponen().getId().equals(k.getIdKomponen()))
.collect(Collectors.toList());
komponenList.forEach(l -> l.setNominal(k.getNominal()));
listKomponen.addAll(komponenList);
} else if (CommonUtil.isNotNullOrEmpty(k.getNominal())) {
@ -508,15 +513,16 @@ public class SlipGajiServiceImpl implements SlipGajiService {
result.put("jabatan", dto.getJabatan());
result.put("unitKerja", dto.getUnitKerja());
result.put("subUnitKerja", dto.getSubUnitKerja());
// List<SlipGajiKomponenDto> komponenDto = dto.getKomponen();
// List<KomponenGaji> listMasterKomponen = komponenGajiDao.findAll(new Sort("id"));
// for (KomponenGaji m : listMasterKomponen) {
// for (SlipGajiKomponenDto k : komponenDto) {
// if (m.getId().equals(k.getIdKomponen())) {
//
// }
// }
// }
// List<SlipGajiKomponenDto> komponenDto = dto.getKomponen();
// List<KomponenGaji> listMasterKomponen = komponenGajiDao.findAll(new
// Sort("id"));
// for (KomponenGaji m : listMasterKomponen) {
// for (SlipGajiKomponenDto k : komponenDto) {
// if (m.getId().equals(k.getIdKomponen())) {
//
// }
// }
// }
return result;
}