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

Merge branch 'dev/pegawai/cuti' of ssh://172.16.55.31/volume1/git/SC-be-java into dev/pegawai/cuti

Browse Source
This commit is contained in:
Salman Manoe 2025-01-14 07:52:50 +07:00
commit e285b15682
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,15 +551,14 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
Date previousYear = DateUtil.getInstanceCalendar(-1); Date previousYear = DateUtil.getInstanceCalendar(-1);
Date janFirstPrevYear = DateUtil.startYear(previousYear); Date janFirstPrevYear = DateUtil.startYear(previousYear);
Date decEndPrevYear = DateUtil.endYear(previousYear); Date decEndPrevYear = DateUtil.endYear(previousYear);
List<PresensiHariLibur> listPresensiPrevYear = mapKalenderToHariLiburDao.getPresensiByTahun(request.getPegawaiId(), List<MapKalenderToHariLibur> listCBPrevYear = mapKalenderToHariLiburDao.getByTahun(LIBUR_CB, janFirstPrevYear,
janFirstPrevYear, decEndPrevYear); decEndPrevYear);
List<MapKalenderToHariLibur> listCBPrevYear = mapKalenderToHariLiburDao.getByTahun(LIBUR_CB, janFirstPrevYear, decEndPrevYear);
int countCBPrevYear = listCBPrevYear.size(); int countCBPrevYear = listCBPrevYear.size();
List<MapKalenderToHariLibur> listCBPrevYearSuspended = listCBPrevYear.stream() List<MapKalenderToHariLibur> listCBPrevYearSuspended = listCBPrevYear.stream()
.filter(MapKalenderToHariLibur::getIsCutiBersamaDitangguhkan) .filter(MapKalenderToHariLibur::getIsCutiBersamaDitangguhkan).collect(Collectors.toList());
.collect(Collectors.toList());
int countCBSuspended = listCBPrevYearSuspended.size();
int countCBAllocated = 0; int countCBAllocated = 0;
List<PresensiHariLibur> listPresensiPrevYear = mapKalenderToHariLiburDao
.getPresensiByTahun(request.getPegawaiId(), janFirstPrevYear, decEndPrevYear);
for (PresensiHariLibur presensiPrevYear : listPresensiPrevYear) { for (PresensiHariLibur presensiPrevYear : listPresensiPrevYear) {
for (MapKalenderToHariLibur cbPrevYearSuspended : listCBPrevYearSuspended) { for (MapKalenderToHariLibur cbPrevYearSuspended : listCBPrevYearSuspended) {
if (presensiPrevYear.getTanggal().equals(cbPrevYearSuspended.getTanggal().getTanggal())) { if (presensiPrevYear.getTanggal().equals(cbPrevYearSuspended.getTanggal().getTanggal())) {
@ -568,8 +567,12 @@ public class JatahCutiDanIzinServiceImpl implements JatahCutiDanIzinService {
} }
} }
} }
if (dto.getCutiTerpakaiB1() < countCBPrevYear && countCBPrevYear - dto.getCutiTerpakaiB1() > countCBSuspended) if (dto.getCutiTerpakaiB1() < countCBPrevYear) {
dto.setDataCutiB(countCBSuspended); if (countCBPrevYear - dto.getCutiTerpakaiB1() > countCBAllocated) {
dto.setDataCutiB(dto.getDataCutiB() + countCBAllocated);
dto.setSisaCutiB(dto.getDataCutiB() - dto.getCutiTerpakaiB());
}
}
return dto; return dto;
} }