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

Compare commits

base: salmanoe:master
Branches Tags
salmanoe:master
salmanoe:dev/technical-debt/clean-code
salmanoe:dev/integrasi/minio
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/add-master-shift/pagi-malem-2-1
salmanoe:dev/base
salmanoe:ade/logbook-tarif/non-kelas-eksekutif
salmanoe:ade/intervensi-cuti/bug-fixing-sisa-cuti
salmanoe:ade/absensi/remove-keterlambatan
salmanoe:ade/jadwal-dinas/juni2026
salmanoe:ade/reporting/modifikasi-printout-cuti
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2
..
compare: salmanoe:ade/logbook-tarif/non-kelas-eksekutif
Branches Tags
salmanoe:dev/technical-debt/clean-code
salmanoe:dev/integrasi/minio
salmanoe:master
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/add-master-shift/pagi-malem-2-1
salmanoe:dev/base
salmanoe:ade/logbook-tarif/non-kelas-eksekutif
salmanoe:ade/intervensi-cuti/bug-fixing-sisa-cuti
salmanoe:ade/absensi/remove-keterlambatan
salmanoe:ade/jadwal-dinas/juni2026
salmanoe:ade/reporting/modifikasi-printout-cuti
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2

No commits in common. "master" and "ade/logbook-tarif/non-kelas-eksekutif" have entirely different histories.
master ... ade/logboo

3 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
jasamedika-bridging/src/main/webapp/WEB-INF/web.xml
View File

@ -15,7 +15,7 @@
</context-param>
<context-param>
<param-name>spring.profiles.default</param-name>
<param-value>bridging</param-value>
<param-value>localhost</param-value>
</context-param>
<listener>

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -393,7 +393,7 @@ public final class Master {
public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x";
public static final Integer[] PSM = { 31, 47, 106, 203, 204 }; // id shift kerja -> ada penambahan 203, 204
public static final Integer RESET = 0;
public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204, 216, 313, 314, 315, 316}; // id shift kerja -> ada penambahan 203, 204
public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204}; // id shift kerja -> ada penambahan 203, 204
}
public static final class StatusPegawai {

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

@ -943,7 +943,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("Pagi Malam 2")) || (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")))) {
try {
List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
List<Map<String, Object>> listAbsensiPM = new ArrayList<>();
@ -951,7 +952,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
Map<String, Object> detailShiftPMPagi = new HashMap<>();
Map<String, Object> detailShiftPMMalam = new HashMap<>();
if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
if ((data.get("namaShift").equals("Pagi Malam"))) {
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
@ -1685,7 +1686,7 @@ 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("Pagi Malam 2")) || (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<>();
@ -1694,7 +1695,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
Map<String, Object> detailShiftPMPagi = new HashMap<>();
Map<String, Object> detailShiftPMMalam = new HashMap<>();
if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
if ((data.get("namaShift").equals("Pagi Malam"))) {
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(