Update PermohonanStatusPegawaiImpl.java
Pengganti cuti bersama mulai tahun 2023
This commit is contained in:
parent
b1dd819b20
commit
6a6a7d5769
@ -427,7 +427,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
|||||||
if (listMap.size() == 2) {
|
if (listMap.size() == 2) {
|
||||||
if (Arrays.asList(Master.ShiftKerja.TUJUH_BELAS_JAM_SHIFT)
|
if (Arrays.asList(Master.ShiftKerja.TUJUH_BELAS_JAM_SHIFT)
|
||||||
.contains(Integer.parseInt(listMap.get(1).get("idShift").toString()))) {
|
.contains(Integer.parseInt(listMap.get(1).get("idShift").toString()))) {
|
||||||
countDataHabsen += 2;
|
if (Integer.parseInt(year) < 2023) {
|
||||||
|
countDataHabsen += 2;
|
||||||
|
} else {
|
||||||
|
countDataHabsen += 1;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
countDataHabsen += 1;
|
countDataHabsen += 1;
|
||||||
}
|
}
|
||||||
@ -442,7 +446,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
|||||||
if (listMap.size() == 2) {
|
if (listMap.size() == 2) {
|
||||||
if (Arrays.asList(Master.ShiftKerja.TUJUH_BELAS_JAM_SHIFT)
|
if (Arrays.asList(Master.ShiftKerja.TUJUH_BELAS_JAM_SHIFT)
|
||||||
.contains(Integer.parseInt(listMap.get(1).get("idShift").toString()))) {
|
.contains(Integer.parseInt(listMap.get(1).get("idShift").toString()))) {
|
||||||
countDataHabsen += 2;
|
if (Integer.parseInt(year) < 2023) {
|
||||||
|
countDataHabsen += 2;
|
||||||
|
} else {
|
||||||
|
countDataHabsen += 1;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
countDataHabsen += 1;
|
countDataHabsen += 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user