perbaikan dua tahun belum berturut-turut dengan kondisi status penangguhan tahun lalu
This commit is contained in:
parent
824baf5c7a
commit
98fd67ff5a
@ -536,8 +536,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
} else {
|
||||
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
|
||||
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) {
|
||||
if (jatahCutiTerpakaiN2 == 0) {
|
||||
if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) {
|
||||
sisaCutiN2 = 6;
|
||||
} else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) {
|
||||
sisaCutiN2 = 0;
|
||||
} else if (!jCutiN2 && !jCutiN1) {
|
||||
sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
|
||||
} else {
|
||||
@ -598,8 +600,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
} else {
|
||||
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
|
||||
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) {
|
||||
if (jatahCutiTerpakaiN2 == 0) {
|
||||
if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) {
|
||||
sisaCutiN2 = 6;
|
||||
} else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) {
|
||||
sisaCutiN2 = 0;
|
||||
} else if (!jCutiN2 && !jCutiN1) {
|
||||
sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
|
||||
} else {
|
||||
@ -727,8 +731,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
} else {
|
||||
if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6
|
||||
&& dataCutiN2 > 0) {
|
||||
if (jatahCutiTerpakaiN2 == 0) {
|
||||
if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) {
|
||||
sisaCutiN2 = 6;
|
||||
} else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) {
|
||||
sisaCutiN2 = 0;
|
||||
} else if (!jCutiN2 && !jCutiN1) {
|
||||
sisaCutiN2 = 6 - jatahCutiTerpakaiN2;
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user