From 52114ead468e48d4da8b0267637fc906dce66c1b Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 4 Jul 2022 17:37:40 +0700 Subject: [PATCH] Update LogbookKinerjaService Pembuatan service daftar pilihan jabatan riwayat pegawai di verifikasi catatan kegiatan harian --- .../medifirst2000/dao/LogbookKinerjaDao.java | 5 +++++ .../service/LogbookKinerjaService.java | 2 ++ .../service/impl/LogbookKinerjaServiceImpl.java | 13 +++++++++++++ .../controller/PegawaiController.java | 15 +++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java index 174edaa5..50e45df8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java @@ -235,4 +235,9 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository findPegawaiKontrakByIndikator(@Param("bulan") String bulan, @Param("indikatorId") Integer idIndikator); + @Query("select distinct new Map(jb.id as id,jb.namaJabatan as namaJabatan," + + "jb.levelJabatan as levelJabatan,jb.unitKerjaId as idUnitKerja) " + "from LogbookKinerja lkt " + + "inner join lkt.jabatan jb " + "where lkt.statusEnabled is true " + "and lkt.pegawaiId = :pegawaiId " + + "and to_char(lkt.bulan,'yyyy-MM') = :bulan") + List> findJabatanByPegawai(@Param("pegawaiId") Integer idPegawai, @Param("bulan") String bulan); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java index 67dbce77..b09bd8fe 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaService.java @@ -74,5 +74,7 @@ public interface LogbookKinerjaService extends BaseVoService> findDetailLogbookFarmakologi(Integer idPegawai, Integer idProduk, String tglPelayanan); + + public List> findJabatanByLogbookPegawai(Integer idPegawai, Long bulan); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index 84d28eda..36f22c9a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -3320,4 +3320,17 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb return result; } + @Override + public List> findJabatanByLogbookPegawai(Integer idPegawai, Long bulan) { + DateFormat mf = new SimpleDateFormat("yyyy-MM"); + + List> result = logbookKinerjaDao.findJabatanByPegawai(idPegawai, + mf.format(new Date(bulan))); + for (Map map : result) { + map.put("isCariAkses", false); + } + + return result; + } + } \ No newline at end of file diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java index 66be196d..075a05b1 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java @@ -1317,6 +1317,21 @@ public class PegawaiController extends LocaleController implements IB return RestUtil.getJsonResponse(result, HttpStatus.OK); } + @RequestMapping(value = "/jabatan-logbook-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity>> getJabatanLogbookKinerja(HttpServletRequest request, + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "bulan") Long bulan) { + List> result = new ArrayList>(); + try { + result = logbookKinerjaService.findJabatanByLogbookPegawai(idPegawai, bulan); + 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-jurusan-by-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListJurusanByPendidikan( @RequestParam(value = "pendidikanId") Integer pendidikanId, HttpServletRequest request) {