From 5fca5e24862fbf3d9949ed4138815ef5d75b3190 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 28 Apr 2023 08:56:04 +0700 Subject: [PATCH] Update service slip gaji validasi nominal slip gaji tidak boleh null, tidak akan disimpan --- .../service/impl/SlipGajiServiceImpl.java | 20 ++++++++++--------- .../controller/SlipGajiController.java | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) 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 9f6f3985..8331be5c 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 @@ -176,15 +176,17 @@ public class SlipGajiServiceImpl implements SlipGajiService { List listKomponen = new ArrayList<>(); List dtos = dto.getKomponen(); dtos.forEach(k -> { - SlipGajiKomponen.SlipGajiKomponenBuilder kBuilder = SlipGajiKomponen.builder(); - if (CommonUtil.isNotNullOrEmpty(k.getId())) - kBuilder.id(k.getId()); - KomponenGaji kGaji = new KomponenGaji(); - kGaji.setId(k.getIdKomponen()); - kBuilder.komponen(kGaji); - kBuilder.nominal(k.getNominal()); - kBuilder.slipGaji(savedSlip); - listKomponen.add(kBuilder.build()); + if (CommonUtil.isNotNullOrEmpty(k.getNominal())) { + SlipGajiKomponen.SlipGajiKomponenBuilder kBuilder = SlipGajiKomponen.builder(); + if (CommonUtil.isNotNullOrEmpty(k.getId())) + kBuilder.id(k.getId()); + KomponenGaji kGaji = new KomponenGaji(); + kGaji.setId(k.getIdKomponen()); + kBuilder.komponen(kGaji); + kBuilder.nominal(k.getNominal()); + kBuilder.slipGaji(savedSlip); + listKomponen.add(kBuilder.build()); + } }); slipGajiKomponenDao.save(listKomponen); } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java index 358bc38e..2c322101 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java @@ -57,7 +57,7 @@ public class SlipGajiController { } @RequestMapping(value = "/unggah", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity save(@RequestBody @Valid List dtoList) { + public ResponseEntity save(@RequestBody List dtoList) { try { slipGajiService.delete(dtoList); slipGajiService.save(dtoList);