From 960383dd9a86727c7c420496377f3b301b6605e3 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 5 Feb 2025 12:34:51 +0700 Subject: [PATCH] Update service jatah cuti Pembuatan endpoint monitoring jatah cuti disertai cuti bersama dan status penangguhan --- .../dao/JatahCutiDanIzinDao.java | 11 +++++++ .../PermohonanStatusPegawaiService.java | 3 ++ .../impl/PermohonanStatusPegawaiImpl.java | 6 ++++ .../dto/MonitoringJatahCutiDto.java | 33 +++++++++++++++++++ .../controller/SdmController.java | 14 ++++++++ 5 files changed, 67 insertions(+) create mode 100644 jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JatahCutiDanIzinDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JatahCutiDanIzinDao.java index f6e22ff1..93330594 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JatahCutiDanIzinDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JatahCutiDanIzinDao.java @@ -1,5 +1,6 @@ package com.jasamedika.medifirst2000.dao; +import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto; import com.jasamedika.medifirst2000.entities.JatahCutiDanIzin; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -79,4 +80,14 @@ public interface JatahCutiDanIzinDao extends JpaRepository findByPegawaiId(@Param("pegawaiId") Integer idPegawai); + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java index 3d9861bd..8983c7cf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java @@ -1,6 +1,7 @@ package com.jasamedika.medifirst2000.service; import com.jasamedika.medifirst2000.dto.DataCutiDto; +import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto; import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex; import com.jasamedika.medifirst2000.vo.JatahCutiDanIzinVO; import com.jasamedika.medifirst2000.vo.KelompokShiftKerjaCustomVO; @@ -82,6 +83,8 @@ public interface PermohonanStatusPegawaiService { List> getAllDataCuti(); + List findByPegawai(Integer idPegawai); + List> getAllDataCuti(Integer idPegawai); Map updatePlanningPegawaiStatus(PlanningPegawaiStatusVO vo); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java index b7ec02c0..c496815e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java @@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiStatusDaoCustom; import com.jasamedika.medifirst2000.dto.DataCutiDto; +import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto; import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JatahCutiDanIzinService; @@ -2160,6 +2161,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return jatahCutiDanIzinDao.getAllJatahCuti(Integer.valueOf(komponen)); } + @Override + public List findByPegawai(Integer idPegawai) { + return jatahCutiDanIzinDao.findByPegawaiId(idPegawai); + } + @Override public List> getAllDataCuti(Integer idPegawai) { LocalDateTime now = LocalDateTime.now(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java new file mode 100644 index 00000000..3e99f02d --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java @@ -0,0 +1,33 @@ +package com.jasamedika.medifirst2000.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Salman + * @version 1.0.0 + * @since 2/5/2025 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class MonitoringJatahCutiDto { + + private String noRec; + + private String komponenCuti; + + private Integer tahun; + + private Integer jatahCuti; + + private Integer cutiTerpakai; + + private Integer sisaCuti; + + private String statusPenangguhan; + +} 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 3983753e..a7847f44 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 @@ -8,6 +8,7 @@ import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.dao.JenisGajiDao; import com.jasamedika.medifirst2000.dao.MapUraianTugasToRincianKegiatanDao; import com.jasamedika.medifirst2000.dto.DataCutiDto; +import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto; import com.jasamedika.medifirst2000.entities.JenisGaji; import com.jasamedika.medifirst2000.entities.MapUraianTugasToRincianKegiatan; import com.jasamedika.medifirst2000.entities.Pegawai; @@ -4976,6 +4977,19 @@ public class SdmController extends LocaleController { } } + @RequestMapping(value = "/jatah-cuti/{pegawai_id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> getListJatahCuti(HttpServletRequest request, + @PathVariable("pegawai_id") Integer idPegawai) { + try { + List dtoList = servicePermohonanStatus.findByPegawai(idPegawai); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(dtoList, HttpStatus.OK); + } catch (Exception e) { + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); + } + } + @RequestMapping(value = "/get-all-jatah-cuti-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListJatahCuti( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) {