Update LogbookKinerjaDetailService
Penyesuaian widget working record aplikasi remunerasi dapat digunakan oleh pegawai blu pkwt
This commit is contained in:
parent
fd5acb5a5c
commit
d730bcf6c3
@ -149,6 +149,7 @@ public class Master {
|
||||
public static final Integer[] PURNA_WAKTU = { 1, 2, 10, 14 };
|
||||
public static final Integer[] REMUN = { 1, 10, 14 };
|
||||
|
||||
public static final Integer BLU_PKWT = 2;
|
||||
public static final Integer DOKTER_TAMU = 19;
|
||||
public static final Integer PNS = 1;
|
||||
public static final Integer MITRA = 16;
|
||||
@ -165,7 +166,7 @@ public class Master {
|
||||
public static final class Kelas {
|
||||
public static final Integer[] KELAS_DUA_TIGA_NONKELAS = { 1, 2, 6 };
|
||||
public static final Integer[] KELAS_SATU_VIP = { 3, 5, 8, 21 };
|
||||
public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8, 21 };
|
||||
public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 };
|
||||
|
||||
public static final Integer KELAS_DUA = 2;
|
||||
public static final Integer KELAS_SATU = 3;
|
||||
|
||||
@ -231,9 +231,12 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
|
||||
|
||||
DateFormat mf = new SimpleDateFormat("yyyy-MM");
|
||||
|
||||
List<Integer> listKategoriPegawaiWorkingRecord = new ArrayList<>();
|
||||
listKategoriPegawaiWorkingRecord.addAll(Arrays.asList(Master.KategoryPegawai.REMUN));
|
||||
listKategoriPegawaiWorkingRecord.add(Master.KategoryPegawai.BLU_PKWT);
|
||||
|
||||
List<Map<String, Object>> tugasVerifikasi = logbookKinerjaDetailDao.findVerifWorkingRecord(idPegawai,
|
||||
mf.format(new Date(bulan)), Arrays.asList(Master.KategoryPegawai.REMUN),
|
||||
Arrays.asList(Master.UnitKerja.KSM));
|
||||
mf.format(new Date(bulan)), listKategoriPegawaiWorkingRecord, Arrays.asList(Master.UnitKerja.KSM));
|
||||
if (CommonUtil.isNotNullOrEmpty(tugasVerifikasi) && tugasVerifikasi.size() == 2) {
|
||||
for (Map<String, Object> tv : tugasVerifikasi) {
|
||||
if (Boolean.valueOf(tv.get("statusVerifikasi").toString())) {
|
||||
@ -259,7 +262,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
|
||||
result.put("tugasVerifikasi", rsMap1);
|
||||
|
||||
List<Map<String, Object>> statusVerifikasi = logbookKinerjaDetailDao.findVerifWorkingRecord(idPegawai,
|
||||
mf.format(new Date(bulan)), Arrays.asList(Master.KategoryPegawai.REMUN));
|
||||
mf.format(new Date(bulan)), listKategoriPegawaiWorkingRecord);
|
||||
if (CommonUtil.isNotNullOrEmpty(statusVerifikasi) && statusVerifikasi.size() == 2) {
|
||||
for (Map<String, Object> sv : statusVerifikasi) {
|
||||
if (Boolean.valueOf(sv.get("statusVerifikasi").toString())) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user