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

Merge branch 'ade/bug-fixing-pagi-malam' into prod/base

Browse Source
This commit is contained in:
adesyawal 2026-07-30 14:46:14 +07:00
commit 1d0d0d2b7f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java
View File

@ -257,6 +257,16 @@ public interface MonitoringAbsenDao extends PagingAndSortingRepository<Monitorin
Map<String, Object> findShiftPMDetail(@Param("idKelompokShift") Integer idKelompokShift, Map<String, Object> findShiftPMDetail(@Param("idKelompokShift") Integer idKelompokShift,
@Param("namaShift") String namaShift, @Param("kodeExternal") String kodeExternal); @Param("namaShift") String namaShift, @Param("kodeExternal") String kodeExternal);
@Query("select new map(shiftKerja.jamMasuk as jamMasuk, " + "shiftKerja.jamPulang as jamPulang, "
+ "shiftKerja.jamBreakAkhir as jamBreakAkhir, " + "shiftKerja.jamBreakAwal as jamBreakAwal, "
+ "shiftKerja.factorRate as factorRate, " + "shiftKerja.operatorFactorRate as operatorFactorRate, "
+ "shiftKerja.komponenIndexId as komponenIndexId, " + "shiftKerja.waktuIstirahat as waktuIstirahat) "
+ "from ShiftKerja shiftKerja " + "left join shiftKerja.kelompokShift kelompokShift "
+ "left join shiftKerja.komponenIndex komponenIndex " + "where kelompokShift.id = :idKelompokShift "
+ "and shiftKerja.namaShift = :namaShift " + "and shiftKerja.kodeExternal = :kodeExternal " + "and shiftKerja.statusEnabled is true")
Map<String, Object> findShiftPMDetailWithStatusEnableTrue(@Param("idKelompokShift") Integer idKelompokShift,
@Param("namaShift") String namaShift, @Param("kodeExternal") String kodeExternal);
@Query("select distinct new map(pegawaiHistoriRekapIndex.nilaiIndex as nilaiIndex, " @Query("select distinct new map(pegawaiHistoriRekapIndex.nilaiIndex as nilaiIndex, "
+ "pegawaiHistoriRekapIndex.nilaiIndexTotal as nilaiIndexTotal, " + "pegawaiHistoriRekapIndex.nilaiIndexTotal as nilaiIndexTotal, "
+ "komponenIndex.komponenIndex as namaKomponenIndex, " + "komponenIndex.id as idKomponenIndex, " + "komponenIndex.komponenIndex as namaKomponenIndex, " + "komponenIndex.id as idKomponenIndex, "

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

@ -1695,10 +1695,17 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
Map<String, Object> detailShiftPMMalam = 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")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
if((tanggal.before(new Date(1780272000000L)) || tanggal.equals(new Date(1780272000000L)))){
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail( detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P"); Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail( detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Malam", "M"); Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Malam", "M");
}else{
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetailWithStatusEnableTrue(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi 1", "P1");
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetailWithStatusEnableTrue(
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Malam", "M");
}
} else if ((data.get("namaShift").equals("Non Shift MOD"))) { } else if ((data.get("namaShift").equals("Non Shift MOD"))) {
if (data.get("namaHari").equals("Senin") || data.get("namaHari").equals("Selasa") if (data.get("namaHari").equals("Senin") || data.get("namaHari").equals("Selasa")
|| data.get("namaHari").equals("Rabu") || data.get("namaHari").equals("Kamis")) { || data.get("namaHari").equals("Rabu") || data.get("namaHari").equals("Kamis")) {