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

perbaikan kondisi rangkap jabatan pada saat pencarian monitoring presensi dan cetak presensi

Browse Source
This commit is contained in:
salmanoe 2021-11-01 21:44:41 +07:00
parent 1a772f82f8
commit d95c824099
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1463,6 +1463,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
String startDate, String endDate) {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> listRs = new ArrayList<Map<String, Object>>();
List<Integer> listIdPegawaiFilter = new ArrayList<>();
List<Integer> listIdPegawai = new ArrayList<>();
if (CommonUtil.isNotNullOrEmpty(idPegawai)) {
@ -1475,6 +1476,12 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
}
for (Integer id : listIdPegawai) {
if (!listIdPegawaiFilter.contains(id)) {
listIdPegawaiFilter.add(id);
}
}
for (Integer id : listIdPegawaiFilter) {
String idFinger = pegawaiDao.getidFinger(id);
Map<String, Object> rsMap = new HashMap<String, Object>();
List<Map<String, Object>> listkehadiran = new ArrayList<Map<String, Object>>();

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -425,10 +425,18 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
@Override
public List<Map<String, Object>> generateLapRekapitulasiKehadiran(Integer idRuangan, String startDate,
String endDate) {
List<Integer> listIdPegawaiFilter = new ArrayList<>();
Map<String, Object> temp = new HashMap<String, Object>();
List<Map<String, Object>> listkehadiran = new ArrayList<Map<String, Object>>();
List<Integer> listIdPegawai = monitoringAbsenDao.findPegawaiAktifDanKaryawanByUnitKerja(idRuangan);
for (Integer idPegawai : listIdPegawai) {
for (Integer id : listIdPegawai) {
if (!listIdPegawaiFilter.contains(id)) {
listIdPegawaiFilter.add(id);
}
}
for (Integer idPegawai : listIdPegawaiFilter) {
temp = monitoringAbsenService.rekapitulasiKehadiranByPegawai(idPegawai, startDate, endDate);
if (CommonUtil.isNotNullOrEmpty(temp)) {
listkehadiran.add(temp);

16
jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
View File

@ -4634,15 +4634,31 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
Map<String, Object> kehadiran = new HashMap<String, Object>();
if (CommonUtil.isNotNullOrEmpty(subUnitKerja) && CommonUtil.isNullOrEmpty(idPegawai)) {
List<Integer> listIdPegawaiFilter = new ArrayList<>();
List<Integer> listIdPegawai = monitoringAbsenDao
.findPegawaiAktifDanKaryawanByUnitKerjaAndSubUnitKerja(unitKerja, subUnitKerja);
for (Integer id : listIdPegawai) {
if (!listIdPegawaiFilter.contains(id)) {
listIdPegawaiFilter.add(id);
}
}
for (Integer id : listIdPegawaiFilter) {
kehadiran = monitoringAbsenService.jumlahKehadiran(null, null, id, startDate, endDate);
listkehadiran.addAll((List<Map<String, Object>>) kehadiran.get("listkehadiran"));
}
} else if (CommonUtil.isNullOrEmpty(subUnitKerja) && CommonUtil.isNullOrEmpty(idPegawai)) {
List<Integer> listIdPegawaiFilter = new ArrayList<>();
List<Integer> listIdPegawai = monitoringAbsenDao.findPegawaiAktifDanKaryawanByUnitKerja(unitKerja);
for (Integer id : listIdPegawai) {
if (!listIdPegawaiFilter.contains(id)) {
listIdPegawaiFilter.add(id);
}
}
for (Integer id : listIdPegawaiFilter) {
kehadiran = monitoringAbsenService.jumlahKehadiran(null, null, id, startDate, endDate);
listkehadiran.addAll((List<Map<String, Object>>) kehadiran.get("listkehadiran"));
}