diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java index 6512de45..68c85e2d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java @@ -29,16 +29,15 @@ public interface IndikatorKinerjaJabatanDao extends PagingAndSortingRepository> findAllJabatanAnjab(); + + "inner join jb.jenisJabatan jj " + "where jb.statusEnabled is true " + "order by jb.namaJabatan, jb.id") + List> findAllJabatan(); @Query("select new Map(jb.id as jabatanId," + "ikt.noRec as noRec," + "ikt.tanggalMulaiBerlaku as tglBerlaku," + "ikt.tanggalPembaharuanData as tglPembaharuanData) " + "from IndikatorKinerjaJabatan ikt " + "inner join ikt.jabatan jb " + "where ikt.statusEnabled is true " + "and ikt.indikatorKinerjaId = :indikatorId " + "and to_char(ikt.tanggalMulaiBerlaku,'yyyy-MM') <= to_char(now(),'yyyy-MM') " - + "and jb.statusEnabled is true " + "and jb.kdJabatan = 'ANJAB' " + "order by jb.namaJabatan, jb.id, " + + "and jb.statusEnabled is true " + "order by jb.namaJabatan, jb.id, " + "ikt.tanggalMulaiBerlaku desc, ikt.tanggalPembaharuanData desc") List> findAllByIndikator(@Param("indikatorId") Integer idIndikator); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java index 032105e9..850ebe1c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java @@ -35,21 +35,19 @@ public interface JabatanDao extends PagingAndSortingRepository @Query("SELECT model from Jabatan model where model.jenisJabatanId = :jenisJabatanId ") List getJabatanStruktural(@Param("jenisJabatanId") Integer jenisJabatanId); - String strQryJabatanByJenis = "SELECT new Map(model.id as idJabatan, model.namaJabatan as namaJabatan) from Jabatan model " - + "where model.statusEnabled is true " + "and model.jenisJabatanId = :jenisJabatanId "; + String strJabatanByJenis = "SELECT new Map(model.id as idJabatan, model.namaJabatan as namaJabatan) from Jabatan model " + + "where model.statusEnabled is true " + "and model.jenisJabatanId = :jenisJabatanId"; - String kdJabatanAnjab = "and model.kdJabatan = :kdJabatan "; + String byUnitKerja = " and model.unitKerjaId = :unitKerjaId"; - String kdJabatanNonanjab = "and model.kdJabatan <> 'ANJAB' "; + String sortNamaJabatan = " order by model.namaJabatan"; - String sortNamaJabatan = "order by namaJabatan"; + @Query(strJabatanByJenis + sortNamaJabatan) + List> getJabatanByJenisJabatan(@Param("jenisJabatanId") Integer jenisJabatanId); - @Query(strQryJabatanByJenis + kdJabatanAnjab + sortNamaJabatan) - List> getJabatanByJenisJabatanAnjab(@Param("jenisJabatanId") Integer jenisJabatanId, - @Param("kdJabatan") String kdJabatan); - - @Query(strQryJabatanByJenis + kdJabatanNonanjab + sortNamaJabatan) - List> getJabatanByJenisJabatanNonanjab(@Param("jenisJabatanId") Integer jenisJabatanId); + @Query(strJabatanByJenis + byUnitKerja + sortNamaJabatan) + List> findModelJabatanByJenisUnit(@Param("jenisJabatanId") Integer jenisJabatanId, + @Param("unitKerjaId") Integer idUnitKerja); @Query("select new Map(jab.id as id, jab.namaJabatan as namaJabatan) " + "from Jabatan jab where jab.statusEnabled is true " + "and jab.jenisJabatanId in (1,5) " @@ -63,18 +61,6 @@ public interface JabatanDao extends PagingAndSortingRepository List> checkNamaJabatan(@Param("namaJabatan") String namaJabatan, @Param("jenisJabatanId") Integer jenisJabatanId); - @Query("select new Map(j.id as id,j.namaJabatan as namaJabatan," - + "min(nj.nilaiTerendah) as nilaiTerendah,max(nj.nilaiTertinggi) as nilaiTertinggi) " - + "from Jabatan j, NilaiKelompokJabatan nj " + "left join nj.kelompokJabatan kj " - + "where j.kelompokJabatanId = kj.id " + "and j.statusEnabled is true " + "and kj.statusEnabled is true " - + "and nj.statusEnabled is true " + "and j.kdJabatan = 'ANJAB' " + "and j.namaExternal = :unitKerja " - + "group by j.id, j.namaJabatan " + "order by j.namaJabatan") - List> findJabatanAnjabByUnitKerja(@Param("unitKerja") String unitKerja); - - @Query("select distinct j.namaExternal from Jabatan j " - + "where j.statusEnabled is true and j.kdJabatan = 'ANJAB' order by j.namaExternal") - List findUnitKerjaAnjab(); - String strJabatan = "select new Map(jb.id as id,jb.namaJabatan as namaJabatan," + "jb.levelJabatan as levelJabatan,jb.subLevelJabatan as levelDireksi," + "jj.id as jenisJabatanId,jj.jenisJabatan as jenisJabatan," + "uk.id as unitKerjaId,uk.name as unitKerja," diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java index b1c94053..033f4a86 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java @@ -383,14 +383,14 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository> findEvaluasiJabatanByPegawai(@Param("pegawaiId") Integer idPegawai); @Query("select new Map(ej.tglHitung as tglHitung,ej.bulan as bulan,ej.tahun as tahun," + "nj.id as idDetailKelompokJabatan,nj.gradeDesc as grade,nj.detailKelompokJabatan as detailKelompokJabatan," + "j.id as idJabatan,j.namaJabatan as namaJabatan,ej.totalNilai as nilaiJabatan) " + "from EvaluasiJabatan ej " + "inner join ej.jabatan j " + "inner join ej.grade nj " - + "where ej.statusEnabled is true " + "and j.id in (:listJabatanId) " + "and j.kdJabatan = 'ANJAB' " + + "where ej.statusEnabled is true " + "and j.id in (:listJabatanId) " + "order by ej.totalNilai desc, ej.tglHitung desc") List> findEvaluasiJabatanByAllJabatanPegawaiBaru( @Param("listJabatanId") List listIdJabatan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java index a05478fb..5174d251 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java @@ -54,8 +54,9 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository> findPenempatanEvaluasiJabatan(@Param("listKategoriId") List idListKategori); + + "and j.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) " + "order by pg.id asc, " + + "pg.nilaiJabatan desc") + public List> findPenempatanEvaluasiJabatan( + @Param("listKategoriId") List idListKategori); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JabatanService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JabatanService.java index 84667908..bfe33c1e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JabatanService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JabatanService.java @@ -17,7 +17,9 @@ public interface JabatanService extends BaseVoService> getListJabatanFungsionalStruktural(); - List> getJabatanByJenisJabatan(Integer idJenisJabatan, String kdJabatan); + List> findModelJabatan(Integer idJenisJabatan); + + List> findModelJabatan(Integer idJenisJabatan, Integer idUnitKerja); Map saveKelompokJabatan(KelompokJabatanVO vo); @@ -27,10 +29,6 @@ public interface JabatanService extends BaseVoService validateNamaJabatan(String namaJabatan, Integer idJenisJabatan); - List> getListJabatanAnjabByUnitKerja(String unitKerja); - - List getListUnitKerjaAnjab(); - List> findJabatan(String namaJabatan, Integer idJenisJabatan, Integer idUnitKerja); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java index a6c286bf..2d2a0a3e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java @@ -350,7 +350,7 @@ public class IndikatorKinerjaJabatanServiceImpl extends BaseVoServiceImpl implem List> data = new ArrayList<>(); List listIdJabatan = new ArrayList<>(); - List> result = indikatorKinerjaJabatanDao.findAllJabatanAnjab(); + List> result = indikatorKinerjaJabatanDao.findAllJabatan(); List> allMap = indikatorKinerjaJabatanDao.findAllByIndikator(idIndikator); for (Map map : allMap) { if (!listIdJabatan.contains(map.get("jabatanId"))) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JabatanServiceImpl.java index be6e2d21..39b954ca 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JabatanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JabatanServiceImpl.java @@ -231,14 +231,16 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ } @Override - public List> getJabatanByJenisJabatan(Integer idJenisJabatan, String kdJabatan) { - List> result = new ArrayList<>(); + public List> findModelJabatan(Integer idJenisJabatan) { + List> result = jabatanDao.getJabatanByJenisJabatan(idJenisJabatan); + + return result; + } + + @Override + public List> findModelJabatan(Integer idJenisJabatan, Integer idUnitKerja) { + List> result = jabatanDao.findModelJabatanByJenisUnit(idJenisJabatan, idUnitKerja); - if (CommonUtil.isNotNullOrEmpty(kdJabatan) && kdJabatan.equals("ANJAB")) { - result = jabatanDao.getJabatanByJenisJabatanAnjab(idJenisJabatan, kdJabatan); - } else { - result = jabatanDao.getJabatanByJenisJabatanNonanjab(idJenisJabatan); - } return result; } @@ -291,24 +293,6 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ return result; } - @Override - public List> getListJabatanAnjabByUnitKerja(String unitKerja) { - List> result = new ArrayList<>(); - - result = jabatanDao.findJabatanAnjabByUnitKerja(unitKerja); - - return result; - } - - @Override - public List getListUnitKerjaAnjab() { - List result = new ArrayList<>(); - - result = jabatanDao.findUnitKerjaAnjab(); - - return result; - } - @Override public List> findJabatan(String namaJabatan, Integer idJenisJabatan, Integer idUnitKerja) { List> result = new ArrayList<>(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java index 57bf9b52..d2cb64a1 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java @@ -978,12 +978,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata mapFilter.put("atasanLangsung", atasanLangsung); mapFilter.put("pejabatPenilai", pejabatPenilai); - if (CommonUtil.isNotNullOrEmpty(jabatan.get("kdJabatan")) && jabatan.get("kdJabatan").equals("ANJAB")) { - mapFilter.put("kdJabatan", "ANJAB"); - } else { - mapFilter.put("kdJabatan", "NONANJAB"); - } - result.add(mapFilter); } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java index b51a9826..534f4ebf 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java @@ -205,7 +205,7 @@ public class JabatanController extends LocaleController { List> result = new ArrayList>(); try { - result = jabatanService.getJabatanByJenisJabatan(idJenisJabatan, "NONANJAB"); + result = jabatanService.findModelJabatan(idJenisJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -234,42 +234,4 @@ public class JabatanController extends LocaleController { } } - @RequestMapping(value = "/get-list-jabatan-anjab-by-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllJabatanAnjabByUnitKerja(HttpServletRequest request, - @RequestParam(value = "unitKerja", required = true) String unitKerja) { - List> result = new ArrayList>(); - try { - - result = jabatanService.getListJabatanAnjabByUnitKerja(unitKerja); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/get-list-unit-kerja-anjab", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> validateNamaJabatan(HttpServletRequest request) { - try { - Map result = new HashMap(); - - List listUnitKerjaAnjab = jabatanService.getListUnitKerjaAnjab(); - if (CommonUtil.isNotNullOrEmpty(listUnitKerjaAnjab)) { - result.put("data", listUnitKerjaAnjab); - } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get list unit kerja anjab", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get list unit kerja anjab", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index b8c45600..9d47a4f6 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -4880,11 +4880,10 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-jabatan-by-jenis-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanByJenisJabatan(HttpServletRequest request, - @RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan, - @RequestParam(value = "kdJabatan", required = false) String kdJabatan) { + @RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan) { List> result = null; try { - result = jabatanService.getJabatanByJenisJabatan(idJenisJabatan, kdJabatan); + result = jabatanService.findModelJabatan(idJenisJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { @@ -4893,6 +4892,22 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK); } + @RequestMapping(value = "/get-jabatan-by-jenis-dan-unit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity>> getJabatanByJenisDanUnitKerja(HttpServletRequest request, + @RequestParam(value = "jenisJabatanId", required = true) Integer idJenisJabatan, + @RequestParam(value = "unitKerjaId", required = true) Integer idUnitKerja) { + List> result = new ArrayList<>(); + try { + result = jabatanService.findModelJabatan(idJenisJabatan, idUnitKerja); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + } catch (Exception e) { + e.printStackTrace(); + } + + return RestUtil.getJsonResponse(result, HttpStatus.OK); + } + @RequestMapping(value = "/save-master-kelompok-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody KelompokJabatanVO vo, HttpServletRequest request) throws ParseException {