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

fixed conflict

Browse Source
This commit is contained in:
adesyawal 2026-01-06 08:43:48 +07:00
commit 166840f3d7
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1654,8 +1654,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
e.printStackTrace();
}
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam"))
|| (data.get("namaShift").equals("Non Shift MOD")))) {
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Non Shift MOD")))) {
//if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && (data.get("namaShift").equals("Non Shift MOD"))) {
try {
List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
List<Map<String, Object>> listAbsensiPM = new ArrayList<>();
@ -1806,11 +1806,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
Map<String, Object> jamEfektif = null;
if (i == 1) {
//jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatPagi, "Pagi");
jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Pagi");
jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatPagi, "Pagi");
//jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Pagi");
} else if (i == 2) {
//jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatMalam, "Malam");
jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Malam");
jamEfektif = jamEfektif(absensiDate, absensiMasuk, jadwalPulang, jadwalMasuk, (Integer) data.get("idKelompokShiftKerja"), waktuIstirahatMalam, "Malam");
//jamEfektif = jamEfektifFactorRate((float) data.get("factorRate"), "Malam");
}
if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
@ -1892,7 +1892,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
}
} catch (ParseException e) {
e.printStackTrace();
}
} else if ((CommonUtil.isNotNullOrEmpty(data.get("absensiPulang")) && CommonUtil.isNullOrEmpty(data.get("absensiMasuk"))) && (CommonUtil.isNotNullOrEmpty(jamMasuk) && CommonUtil.isNotNullOrEmpty(jamPulang))) {
absenTunggal++;
@ -2019,17 +2019,17 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
}
}
data.put("jamEfektif", jamEf);
data.put("jam_efektif", jamEf);
data.put("kelebihanJamKerja", kelebihanJamKerja);
dataPM.put("jamEfektif", jamEf); //xxx
dataPM.put("jam_efektif", jamEf); //xxx
dataPM.put("kelebihanJamKerja", kelebihanJamKerja);
rsMap.put("jumlahCountKelebihanJamKerja", jumlahCountKelebihanJamKerja);
rsMap.put("jumlahKelebihanJamKerja", jumlahKelebihanJamKerja / 60);
rsMap.put("jumlahKelebihanMenitKerja", jumlahKelebihanJamKerja);
data.put("jumlahTerlambat", jumlahTerlambat.toString());
data.put("jumlahJamEfektif", jumlahJamEfektif.toString());
data.put("jumlahPulangAwal", jumlahPulangAwal.toString());
data.put("alasan", alasanCuti);
listkehadiran.add(data);
dataPM.put("jumlahTerlambat", jumlahTerlambat.toString()); //xxx
dataPM.put("jumlahJamEfektif", jumlahJamEfektif.toString()); //xxx
dataPM.put("jumlahPulangAwal", jumlahPulangAwal.toString()); //xxx
dataPM.put("alasan", alasanCuti); //xxx
listkehadiran.add(dataPM);
}
rsMap.put("jumlahKelebihanJamKerja", jumlahKelebihanJamKerja / 60);
rsMap.put("jumlahKelebihanMenitKerja", jumlahKelebihanJamKerja);
@ -2368,17 +2368,19 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
if (CommonUtil.isNotNullOrEmpty(listkehadiran) && CommonUtil.isNotNullOrEmpty(groupKodeShift)) {
if (Arrays.asList(listKetidakhadiran).contains(groupKodeShift)) {
dataShift.put(groupKodeShift, listkehadiran.stream().filter(
long jumlah = listkehadiran.stream().filter(
p -> p.containsKey("kodeShift") &&
groupKodeShift.equals(p.get("kodeShift"))
).count());
).count();
dataShift.put(groupKodeShift, jumlah);
}else{
dataShift.put(groupKodeShift, listkehadiran.stream().filter(
long jumlah = listkehadiran.stream().filter(
p -> p.containsKey("kodeShift") &&
groupKodeShift.equals(p.get("kodeShift")) &&
!p.get("absensiMasuk").equals("-") &&
!p.get("absensiPulang").equals("-")
).count());
).count();
dataShift.put(groupKodeShift, jumlah);
}
}
}

11
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
View File

@ -2452,7 +2452,16 @@ public class SdmController extends LocaleController<AkunVO> {
mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
return getJsonResponse(result, OK);
} catch (Exception e) {
return getJsonHttpStatus(INTERNAL_SERVER_ERROR);
Map<String, Object> error = new HashMap<>();
error.put("message", e.getMessage());
if (e.getStackTrace() != null && e.getStackTrace().length > 0) {
error.put("line", e.getStackTrace()[0].getLineNumber());
error.put("class", e.getStackTrace()[0].getClassName());
error.put("method", e.getStackTrace()[0].getMethodName());
}
return RestUtil.getJsonResponse(error, HttpStatus.INTERNAL_SERVER_ERROR);
}
}