Merge branch 'dev/pegawai/cuti' into dev/no-cron
This commit is contained in:
commit
6b721fbefa
@ -553,6 +553,8 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
|
||||
}
|
||||
|
||||
private DataCutiDto tangguhkanCutiBersama(DataCutiDto dto, JatahCutiRequest request) {
|
||||
if (CommonUtil.isNullOrEmpty(request.getYear()))
|
||||
request.setYear(String.valueOf(DateUtil.getYear(new Date())));
|
||||
Date tahunLalu = DateUtil.getInstanceCalendar(-1);
|
||||
Date awalTahunLalu = DateUtil.startYear(tahunLalu);
|
||||
Date akhirTahunLalu = DateUtil.endYear(tahunLalu);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user