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

perbaikan hitung sisa cuti dua tahun lalu jika belum memakai jatah cuti dua tahun berturut-turut

Browse Source
This commit is contained in:
salmanoe 2021-01-11 16:23:56 +07:00
parent cfabf59e87
commit 824baf5c7a
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
View File

@ -531,12 +531,18 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
// menghitung sisa cuti terlebih dahulu // menghitung sisa cuti terlebih dahulu
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && jCutiN1) { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) {
sisaCutiN2 = 0; // hangus sisaCutiN2 = 0; // hangus
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2; if (jatahCutiTerpakaiN2 == 0) {
sisaCutiN2 = 6;
} else if (!jCutiN2 && !jCutiN1) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
} else {
sisaCutiN2 = 0;
}
} else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) } else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) {
sisaCutiN2 = 0; sisaCutiN2 = 0;
@ -587,12 +593,18 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
// menghitung sisa cuti terlebih dahulu // menghitung sisa cuti terlebih dahulu
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && jCutiN1) { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) {
sisaCutiN2 = 0; // hangus sisaCutiN2 = 0; // hangus
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2; if (jatahCutiTerpakaiN2 == 0) {
sisaCutiN2 = 6;
} else if (!jCutiN2 && !jCutiN1) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
} else {
sisaCutiN2 = 0;
}
} else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) } else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) {
sisaCutiN2 = 0; sisaCutiN2 = 0;
@ -710,12 +722,18 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
// menghitung sisa cuti // menghitung sisa cuti
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) >= 0 && jCutiN1) { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) {
sisaCutiN2 = 0; // hangus sisaCutiN2 = 0; // hangus
} else { } else {
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6
&& dataCutiN2 > 0) { && dataCutiN2 > 0) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2; if (jatahCutiTerpakaiN2 == 0) {
sisaCutiN2 = 6;
} else if (!jCutiN2 && !jCutiN1) {
sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
} else {
sisaCutiN2 = 0;
}
} else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) } else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) { + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) {
sisaCutiN2 = 0; sisaCutiN2 = 0;