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

Merge branch 'dev/base' into dev/integrasi/minio

Browse Source
This commit is contained in:
adesyawal 2026-01-18 09:51:21 +07:00
commit 2f29beded1
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
View File

@ -264,17 +264,21 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
return result; return result;
} }
public Map<String, Object> jamEfektifTunggal(Date jadwalPulang, Date jadwalMasuk, long waktuIstirahat, String shift) { public Map<String, Object> jamEfektifTunggal(Date jadwalPulang, Date jadwalMasuk, long waktuIstirahat, String shift, float factorRate) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
String jam_efektif; String jam_efektif;
long minutes; long minutes;
Long minutesAbsen = (long) 0; Long minutesAbsen = (long) 0;
Long minutesJadwal = (long) 0; Long minutesJadwal = (long) 0;
if (CommonUtil.isNotNullOrEmpty(jadwalMasuk) && CommonUtil.isNotNullOrEmpty(jadwalPulang)) { if (CommonUtil.isNotNullOrEmpty(factorRate)) {
minutesJadwal = reduceTime(jadwalPulang, jadwalMasuk); minutesJadwal = (long) (factorRate * 60);
if (minutesJadwal > 30) { }else{
minutesJadwal = minutesJadwal - waktuIstirahat; // 30_adalah_waktu_istirahat if (CommonUtil.isNotNullOrEmpty(jadwalMasuk) && CommonUtil.isNotNullOrEmpty(jadwalPulang)) {
minutesJadwal = reduceTime(jadwalPulang, jadwalMasuk);
if (minutesJadwal > 30) {
minutesJadwal = minutesJadwal - waktuIstirahat; // 30_adalah_waktu_istirahat
}
} }
} }
@ -1870,7 +1874,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) { if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) {
absenTunggal++; absenTunggal++;
Map<String, Object> jamEfektif = new HashMap<>(); Map<String, Object> jamEfektif = new HashMap<>();
jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift")); jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"), (float) factorRateX);
if (CommonUtil.isNotNullOrEmpty(jamEfektif)) { if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
jamEf = (String) jamEfektif.get("jam_efektif"); jamEf = (String) jamEfektif.get("jam_efektif");
@ -2173,12 +2177,25 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) { if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) {
absenTunggal++; absenTunggal++;
Map<String, Object> jamEfektif = new HashMap<>(); Map<String, Object> jamEfektif = new HashMap<>();
jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift")); jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"), (float) factorRateX);
if (CommonUtil.isNotNullOrEmpty(jamEfektif)) { if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
jamEf = (String) jamEfektif.get("jam_efektif"); jamEf = (String) jamEfektif.get("jam_efektif");
jumlahJamEfektif += (Long) jamEfektif.get("Minutes_Efektif"); jumlahJamEfektif += (Long) jamEfektif.get("Minutes_Efektif");
if (count == 1) {
if ( CommonUtil.isNotNullOrEmpty(data.get("terlambat"))) {
jumlahTerlambat -= (long) data.get("terlambat");
jumlahCountTerlambat -= 1;
data.put("terlambat", "0");
data.put("telat", (long) 0);
}
}else{
jumlahTerlambat += (long) 0;
data.put("terlambat", "0");
data.put("telat", (long) 0);
}
if (((Integer) jamEfektif.get("hariKerja")) != 0) { if (((Integer) jamEfektif.get("hariKerja")) != 0) {
harikerja += (Integer) jamEfektif.get("hariKerja"); harikerja += (Integer) jamEfektif.get("hariKerja");
p1 += (Integer) jamEfektif.get("p1"); p1 += (Integer) jamEfektif.get("p1");
@ -2187,11 +2204,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
malam += (Integer) jamEfektif.get("malam"); malam += (Integer) jamEfektif.get("malam");
data.putAll(jamEfektif); data.putAll(jamEfektif);
} }
}else{
jumlahTerlambat += (long) 0;
data.put("terlambat", "0");
data.put("telat", (long) 0);
} }
jumlahTerlambat += (long) 0;
data.put("terlambat", "0");
data.put("telat", (long) 0);
} }
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
@ -2199,6 +2216,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
} else if ((CommonUtil.isNotNullOrEmpty(data.get("absensiPulang")) && CommonUtil.isNullOrEmpty(data.get("absensiMasuk"))) && (CommonUtil.isNotNullOrEmpty(jamMasuk) && CommonUtil.isNotNullOrEmpty(jamPulang))) { } else if ((CommonUtil.isNotNullOrEmpty(data.get("absensiPulang")) && CommonUtil.isNullOrEmpty(data.get("absensiMasuk"))) && (CommonUtil.isNotNullOrEmpty(jamMasuk) && CommonUtil.isNotNullOrEmpty(jamPulang))) {
absenTunggal++; absenTunggal++;
System.out.print("terlambat 2");
} else if ( CommonUtil.isNotNullOrEmpty(data.get("factorRate")) && factorRateX > 0.0 && Arrays.asList(listKetidakhadiran).contains(data.get("kodeShift")) ) { } else if ( CommonUtil.isNotNullOrEmpty(data.get("factorRate")) && factorRateX > 0.0 && Arrays.asList(listKetidakhadiran).contains(data.get("kodeShift")) ) {
//System.out.print("Ini Gua Cuti 123"); //System.out.print("Ini Gua Cuti 123");
Map<String, Object> jamEfektif = new HashMap<>(); Map<String, Object> jamEfektif = new HashMap<>();