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

perbaikan syarat hangus data cuti dua tahun lalu

Browse Source
This commit is contained in:
salmanoe 2021-01-11 13:56:08 +07:00
parent 41307fd191
commit cfabf59e87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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