Update sdm service
Penyesuaian hak akses untuk seluruh pegawai sdm
This commit is contained in:
parent
447862e3c3
commit
7dfdc569a8
@ -348,8 +348,6 @@ public final class Master {
|
||||
public static final Integer KK_PERINATOLOGI = 217;
|
||||
public static final Integer KK_RADIOLOGI = 203;
|
||||
public static final Integer KK_UMUM = 222;
|
||||
public static final Integer SUBBAG_KESEJAHTERAAN = 26;
|
||||
public static final Integer SUBBAG_PENGEMBANGAN = 27;
|
||||
}
|
||||
|
||||
public static final class TabelAcuanIndeksIKI {
|
||||
|
||||
@ -775,6 +775,12 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
|
||||
+ "inner join mapPegawai.jabatan jabatan " + "where mapPegawai.jabatan.id = :idJabatan")
|
||||
Map<String, Object> getKepalaPegawai(@Param("idJabatan") Integer idJabatan);
|
||||
|
||||
@Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
|
||||
+ "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId "
|
||||
+ "and mj.statusEnabled is true and pg.statusEnabled is true and jb.statusEnabled is true "
|
||||
+ "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4,5))")
|
||||
List<Integer> getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja);
|
||||
|
||||
@Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
|
||||
+ "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId "
|
||||
+ "and mj.statusEnabled is true and pg.statusEnabled is true and jb.statusEnabled is true "
|
||||
|
||||
@ -879,8 +879,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
||||
|
||||
List<Integer> listPurnaWaktu = Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU);
|
||||
|
||||
List<Integer> listIdSDM = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM,
|
||||
Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN);
|
||||
List<Integer> listIdSDM = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM);
|
||||
if (listIdSDM.contains(idPegawai)) {
|
||||
rsAll = pegawaiDao.findPegawaiByListKategori(listPurnaWaktu);
|
||||
result.addAll(rsAll);
|
||||
|
||||
@ -1724,7 +1724,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
|
||||
|
||||
@Override
|
||||
public List<Integer> findPegawaiSDMforCred() {
|
||||
return pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM, Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN);
|
||||
return pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -1180,19 +1180,15 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
|
||||
int currentYear = Calendar.getInstance().get(Calendar.YEAR);
|
||||
|
||||
List<Integer> pegawaiSdmKesejahteraan = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM,
|
||||
Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN);
|
||||
List<Integer> pegawaiSdmPengembangan = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM,
|
||||
Master.SubUnitKerja.SUBBAG_PENGEMBANGAN);
|
||||
List<Integer> pegawaiSdm = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM);
|
||||
|
||||
List<Map<String, Object>> listData = planningPegawaiStatusDao.getApprovalStatus(idPegawai,
|
||||
Integer.toString(currentYear), Master.PengajuanCuti.DITANGGUHKAN, Master.PengajuanCuti.BELUM_DISETUJUI,
|
||||
Arrays.asList(Master.StatusPegawai.KETIDAKHADIRAN));
|
||||
if (pegawaiSdmKesejahteraan.contains(idPegawai)) {
|
||||
if (pegawaiSdm.contains(idPegawai)) {
|
||||
List<Map<String, Object>> listDataCutiAlasanPentingDanSakit = planningPegawaiStatusDao.getApprovalStatusSdm(
|
||||
Master.PengajuanCuti.BELUM_DISETUJUI, Arrays.asList(Master.StatusPegawai.SAKIT_ALASAN_PENTING));
|
||||
listData.addAll(listDataCutiAlasanPentingDanSakit);
|
||||
} else if (pegawaiSdmPengembangan.contains(idPegawai)) {
|
||||
List<Map<String, Object>> listDataCutiTugasLuar = planningPegawaiStatusDao.getApprovalStatusSdm(
|
||||
Master.PengajuanCuti.BELUM_DISETUJUI, Arrays.asList(Master.StatusPegawai.TUGAS_LUAR));
|
||||
listData.addAll(listDataCutiTugasLuar);
|
||||
@ -1273,8 +1269,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
@Override
|
||||
public List<Map<String, Object>> getListTanggalPermohonan(Integer idPegawai) {
|
||||
List<Map<String, Object>> listResult = new ArrayList<>();
|
||||
List<Integer> pegawaiSdm = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM,
|
||||
Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN);
|
||||
List<Integer> pegawaiSdm = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM);
|
||||
List<Map<String, Object>> listData = planningPegawaiStatusDaoCustom.getApprovalStatus(idPegawai);
|
||||
|
||||
// store idPegawai dan tanggal permohonan
|
||||
@ -2330,8 +2325,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
|
||||
@Override
|
||||
public Map<String, Object> getApprovalStatusByNorecPlanning(Integer idPegawai, String noRec) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
List<Integer> pegawaiSdm = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM,
|
||||
Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN);
|
||||
List<Integer> pegawaiSdm = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM);
|
||||
List<Map<String, Object>> listData = planningPegawaiStatusDaoCustom.getApprovalStatusByNorecPlanning(idPegawai,
|
||||
noRec);
|
||||
if (pegawaiSdm.contains(idPegawai)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user