From cfabf59e87357782f48d25da769c19e05c054a3b Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 11 Jan 2021 13:56:08 +0700 Subject: [PATCH] perbaikan syarat hangus data cuti dua tahun lalu --- .../service/impl/PermohonanStatusPegawaiImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java index 16c5a5f6..82e397aa 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java @@ -531,7 +531,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi // menghitung sisa cuti terlebih dahulu if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && !jCutiN2) { + if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && jCutiN1) { sisaCutiN2 = 0; // hangus } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) @@ -587,7 +587,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi // menghitung sisa cuti terlebih dahulu if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && !jCutiN2) { + if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && jCutiN1) { sisaCutiN2 = 0; // hangus } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) @@ -710,7 +710,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi // menghitung sisa cuti if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && !jCutiN2) { + if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && jCutiN1) { sisaCutiN2 = 0; // hangus } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6