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

Merge branch 'dev/pegawai/cuti' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-01-20 16:28:23 +07:00
commit 6b721fbefa
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JatahCutiDanIzinServiceImpl.java
View File

@ -553,6 +553,8 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
} }
private DataCutiDto tangguhkanCutiBersama(DataCutiDto dto, JatahCutiRequest request) { 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 tahunLalu = DateUtil.getInstanceCalendar(-1);
Date awalTahunLalu = DateUtil.startYear(tahunLalu); Date awalTahunLalu = DateUtil.startYear(tahunLalu);
Date akhirTahunLalu = DateUtil.endYear(tahunLalu); Date akhirTahunLalu = DateUtil.endYear(tahunLalu);