From 3205c29c080f7dc1410eab4bdeb627d1482342a2 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Thu, 8 Apr 2021 21:44:07 +0700 Subject: [PATCH] - pembuatan fungsi simpan, edit, hapus master jabatan spesifik unit kerja - perbaikan metode mendapatkan nilai jabatan tertinggi saat evaluasi jabatan dan simpan data jabatan pegawai --- .../medifirst2000/dao/JabatanDao.java | 41 +++++ .../medifirst2000/service/JabatanService.java | 8 +- .../impl/EvaluasiJabatanServiceImpl.java | 12 +- .../service/impl/JabatanServiceImpl.java | 141 ++++++++++++++---- ...pPegawaiJabatanToUnitKerjaServiceImpl.java | 15 +- .../controller/JabatanController.java | 82 ++++++---- 6 files changed, 228 insertions(+), 71 deletions(-) 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 452b47d0..032105e9 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 @@ -75,4 +75,45 @@ public interface JabatanDao extends PagingAndSortingRepository + "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," + + "el.id as eselonId,el.eselon as eselon) " + "from Jabatan jb " + "inner join jb.jenisJabatan jj " + + "inner join jb.unitKerja uk " + "left join jb.eselon el with el.statusEnabled is true " + + "where jb.statusEnabled is true " + "and jj.statusEnabled is true " + "and uk.statusEnabled is true"; + + String namaJabatan = " and lower(jb.namaJabatan) like %:namaJabatan%"; + + String jenisJabatan = " and jj.id = :jenisJabatanId"; + + String unitKerja = " and uk.id = :unitKerjaId"; + + @Query(strJabatan) + List> findJabatan(); + + @Query(strJabatan + namaJabatan) + List> findJabatanByNama(@Param("namaJabatan") String namaJabatan); + + @Query(strJabatan + jenisJabatan) + List> findJabatanByJenis(@Param("jenisJabatanId") Integer idJenisJabatan); + + @Query(strJabatan + unitKerja) + List> findJabatanByUnit(@Param("unitKerjaId") Integer idUnitKerja); + + @Query(strJabatan + namaJabatan + jenisJabatan) + List> findJabatanByNamaJenis(@Param("namaJabatan") String namaJabatan, + @Param("jenisJabatanId") Integer idJenisJabatan); + + @Query(strJabatan + namaJabatan + unitKerja) + List> findJabatanByNamaUnit(@Param("namaJabatan") String namaJabatan, + @Param("unitKerjaId") Integer idUnitKerja); + + @Query(strJabatan + jenisJabatan + unitKerja) + List> findJabatanByJenisUnit(@Param("jenisJabatanId") Integer idJenisJabatan, + @Param("unitKerjaId") Integer idUnitKerja); + + @Query(strJabatan + namaJabatan + jenisJabatan + unitKerja) + List> findJabatanByNamaJenisUnit(@Param("namaJabatan") String namaJabatan, + @Param("jenisJabatanId") Integer idJenisJabatan, @Param("unitKerjaId") Integer idUnitKerja); + } 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 772b6c92..84667908 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 @@ -24,11 +24,13 @@ public interface JabatanService extends BaseVoService> getKelompokJabatan(); JabatanVO deleteJabatan(JabatanVO vo); - + Map 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/EvaluasiJabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiJabatanServiceImpl.java index 7393fdd6..1153ba9b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiJabatanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiJabatanServiceImpl.java @@ -175,10 +175,14 @@ public class EvaluasiJabatanServiceImpl extends BaseVoServiceImpl implements Eva List listPegawai = new ArrayList<>(); for (Integer idPegawai : listIdPegawai) { Pegawai pegawai = pegawaiDao.findOne(idPegawai); - pegawai.setNilaiJabatan(model.getTotalNilai()); - pegawai.setGrade(Double.valueOf(nilaiKelompokJabatan.getGradeDesc())); - pegawai.setDetailKelompokJabatan(nilaiKelompokJabatan); - listPegawai.add(pegawai); + if ((CommonUtil.isNotNullOrEmpty(pegawai.getNilaiJabatan()) + && pegawai.getNilaiJabatan() < model.getTotalNilai()) + || CommonUtil.isNullOrEmpty(pegawai.getNilaiJabatan())) { + pegawai.setNilaiJabatan(model.getTotalNilai()); + pegawai.setGrade(Double.valueOf(nilaiKelompokJabatan.getGradeDesc())); + pegawai.setDetailKelompokJabatan(nilaiKelompokJabatan); + listPegawai.add(pegawai); + } } if (CommonUtil.isNotNullOrEmpty(listPegawai)) { pegawaiDao.save(listPegawai); 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 937e1b3b..be6e2d21 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 @@ -9,7 +9,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.JabatanDao; @@ -22,8 +21,11 @@ import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.JabatanService; import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.EselonVO; import com.jasamedika.medifirst2000.vo.JabatanVO; +import com.jasamedika.medifirst2000.vo.JenisJabatanVO; import com.jasamedika.medifirst2000.vo.KelompokJabatanVO; +import com.jasamedika.medifirst2000.vo.UnitKerjaPegawaiVO; /** * Implement class for JabatanService @@ -37,10 +39,19 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ private BaseConverterImpl jabatanConverter; @Autowired - private JabatanDao jabatanDao; + private BaseConverterImpl kelompokJabatanConverter; @Autowired - private BaseConverterImpl kelompokJabatanConverter; + private BaseConverterImpl jenisJabatanConverter; + + @Autowired + private BaseConverterImpl unitKerjaConverter; + + @Autowired + private BaseConverterImpl eselonConverter; + + @Autowired + private JabatanDao jabatanDao; @Autowired private KelompokJabatanDao kelompokJabatanDao; @@ -63,58 +74,91 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ } @Override - @Transactional(readOnly = false) public JabatanVO add(JabatanVO vo) throws JpaSystemException, ServiceVOException { Jabatan jabatan = jabatanConverter.transferVOToModel(vo, new Jabatan()); - jabatanDao.save(jabatan); - return vo; + JenisJabatan jenisJabatan = jenisJabatanConverter.transferVOToModel(vo.getJenisJabatan(), new JenisJabatan()); + UnitKerjaPegawai unitKerja = unitKerjaConverter.transferVOToModel(vo.getUnitKerja(), new UnitKerjaPegawai()); + + if (CommonUtil.isNotNullOrEmpty(vo.getKelompokJabatan())) { + KelompokJabatan kelompokJabatan = kelompokJabatanConverter.transferVOToModel(vo.getKelompokJabatan(), + new KelompokJabatan()); + jabatan.setKelompokJabatan(kelompokJabatan); + } + if (CommonUtil.isNotNullOrEmpty(vo.getEselon())) { + Eselon eselon = eselonConverter.transferVOToModel(vo.getEselon(), new Eselon()); + jabatan.setEselon(eselon); + } + jabatan.setUnitKerja(unitKerja); + jabatan.setJenisJabatan(jenisJabatan); + Jabatan resultModel = jabatanDao.save(jabatan); + + JabatanVO resultVO = new JabatanVO(); + resultVO = jabatanConverter.transferModelToVO(resultModel, resultVO); + + return resultVO; } @Override - @Transactional(readOnly = false) public JabatanVO update(JabatanVO vo) throws JpaSystemException, ServiceVOException { - Jabatan jabatan = jabatanDao.findOne(vo.getId()); + Jabatan jabatanLama = jabatanDao.findOne(vo.getId()); + Jabatan jabatanBaru = jabatanConverter.transferVOToModel(vo, jabatanLama); - if (CommonUtil.isNotNullOrEmpty(jabatan)) { - JenisJabatan jenisJabatan = new JenisJabatan(); - jenisJabatan.setId(vo.getJenisJabatan().getId()); + JenisJabatan jenisJabatan = jenisJabatanConverter.transferVOToModel(vo.getJenisJabatan(), new JenisJabatan()); + UnitKerjaPegawai unitKerja = unitKerjaConverter.transferVOToModel(vo.getUnitKerja(), new UnitKerjaPegawai()); - Eselon eselon = new Eselon(); - eselon.setId(vo.getEselon().getId()); - - BeanUtils.copyProperties(vo, jabatan); - - jabatan.setJenisJabatan(jenisJabatan); - jabatan.setEselon(eselon); - - jabatanDao.save(jabatan); - - vo.setNoRec(jabatan.getNoRec()); + if (CommonUtil.isNotNullOrEmpty(vo.getKelompokJabatan())) { + KelompokJabatan kelompokJabatan = kelompokJabatanConverter.transferVOToModel(vo.getKelompokJabatan(), + new KelompokJabatan()); + jabatanBaru.setKelompokJabatan(kelompokJabatan); } + if (CommonUtil.isNotNullOrEmpty(vo.getEselon())) { + Eselon eselon = eselonConverter.transferVOToModel(vo.getEselon(), new Eselon()); + jabatanBaru.setEselon(eselon); + } + jabatanBaru.setUnitKerja(unitKerja); + jabatanBaru.setJenisJabatan(jenisJabatan); + Jabatan resultModel = jabatanDao.save(jabatanBaru); - return vo; + JabatanVO resultVO = new JabatanVO(); + resultVO = jabatanConverter.transferModelToVO(resultModel, resultVO); + + return resultVO; } @Override public Boolean delete(Integer key) throws JpaSystemException { - if (CommonUtil.isNotNullOrEmpty(key)) { - Jabatan jabatan = jabatanDao.findOne(key); - jabatanDao.delete(jabatan); - return true; - } else { - return false; - } + jabatanDao.delete(key); + + return true; } @Override public JabatanVO findById(Integer key) throws JpaSystemException { - return null; + JabatanVO result = new JabatanVO(); + + Jabatan jabatan = jabatanDao.findOne(key); + if (CommonUtil.isNotNullOrEmpty(jabatan)) { + result = jabatanConverter.transferModelToVO(jabatan, result); + } + + return result; } @Override public List findAll() throws JpaSystemException { - return null; + List result = new ArrayList<>(); + + Iterable models = jabatanDao.findAll(); + if (CommonUtil.isNotNullOrEmpty(models)) { + for (Jabatan model : models) { + JabatanVO vo = new JabatanVO(); + vo = jabatanConverter.transferModelToVO(model, vo); + result.add(vo); + } + } + + return result; } @Override @@ -265,4 +309,37 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ return result; } + @Override + public List> findJabatan(String namaJabatan, Integer idJenisJabatan, Integer idUnitKerja) { + List> result = new ArrayList<>(); + + if (CommonUtil.isNullOrEmpty(namaJabatan) && CommonUtil.isNullOrEmpty(idJenisJabatan) + && CommonUtil.isNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatan(); + } else if (CommonUtil.isNotNullOrEmpty(namaJabatan) && CommonUtil.isNullOrEmpty(idJenisJabatan) + && CommonUtil.isNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByNama(namaJabatan); + } else if (CommonUtil.isNullOrEmpty(namaJabatan) && CommonUtil.isNotNullOrEmpty(idJenisJabatan) + && CommonUtil.isNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByJenis(idJenisJabatan); + } else if (CommonUtil.isNullOrEmpty(namaJabatan) && CommonUtil.isNullOrEmpty(idJenisJabatan) + && CommonUtil.isNotNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByUnit(idUnitKerja); + } else if (CommonUtil.isNotNullOrEmpty(namaJabatan) && CommonUtil.isNotNullOrEmpty(idJenisJabatan) + && CommonUtil.isNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByNamaJenis(namaJabatan, idJenisJabatan); + } else if (CommonUtil.isNotNullOrEmpty(namaJabatan) && CommonUtil.isNullOrEmpty(idJenisJabatan) + && CommonUtil.isNotNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByNamaUnit(namaJabatan, idUnitKerja); + } else if (CommonUtil.isNullOrEmpty(namaJabatan) && CommonUtil.isNotNullOrEmpty(idJenisJabatan) + && CommonUtil.isNotNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByJenisUnit(idJenisJabatan, idUnitKerja); + } else if (CommonUtil.isNotNullOrEmpty(namaJabatan) && CommonUtil.isNotNullOrEmpty(idJenisJabatan) + && CommonUtil.isNotNullOrEmpty(idUnitKerja)) { + result = jabatanDao.findJabatanByNamaJenisUnit(namaJabatan, idJenisJabatan, idUnitKerja); + } + + return result; + } + } \ No newline at end of file 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 6840fb49..57bf9b52 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 @@ -261,7 +261,12 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata if (CommonUtil.isNotNullOrEmpty(map.getPegawaiId())) { Map evaluasiJabatan = this.getEvaluasiJabatanByPegawai(map.getPegawaiId()); pegawai.setId(map.getPegawaiId()); - if (CommonUtil.isNotNullOrEmpty(evaluasiJabatan)) { + if ((CommonUtil.isNotNullOrEmpty(evaluasiJabatan) + && CommonUtil.isNullOrEmpty(pegawai.getNilaiJabatan())) + || (CommonUtil.isNotNullOrEmpty(evaluasiJabatan) + && CommonUtil.isNotNullOrEmpty(pegawai.getNilaiJabatan()) + && pegawai.getNilaiJabatan() < Double + .valueOf(evaluasiJabatan.get("nilaiJabatan").toString()))) { pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString())); pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString())); NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan(); @@ -675,7 +680,12 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { Map evaluasiJabatan = this.getEvaluasiJabatanByPegawai(vo.getPegawai().getId()); pegawai.setId(vo.getPegawai().getId()); - if (CommonUtil.isNotNullOrEmpty(evaluasiJabatan)) { + if ((CommonUtil.isNotNullOrEmpty(evaluasiJabatan) + && CommonUtil.isNullOrEmpty(pegawai.getNilaiJabatan())) + || (CommonUtil.isNotNullOrEmpty(evaluasiJabatan) + && CommonUtil.isNotNullOrEmpty(pegawai.getNilaiJabatan()) + && pegawai.getNilaiJabatan() < Double + .valueOf(evaluasiJabatan.get("nilaiJabatan").toString()))) { pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString())); pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString())); NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan(); @@ -1623,6 +1633,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata Map result = new HashMap<>(); List> data = mapPegawaiJabatanToUnitKerjaDao.findEvaluasiJabatanByPegawai(idPegawai); + if (CommonUtil.isNotNullOrEmpty(data)) { result = data.get(0); } 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 6a67f6f7..b51a9826 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 @@ -1,5 +1,6 @@ package com.jasamedika.medifirst2000.controller; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -24,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController; import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.core.web.WebConstants; import com.jasamedika.medifirst2000.exception.ServiceVOException; @@ -35,23 +35,12 @@ import com.jasamedika.medifirst2000.vo.JabatanVO; @RestController @RequestMapping("/jabatan") -public class JabatanController extends LocaleController implements IBaseRestController { - - @Autowired - private JabatanService jabatanService; +public class JabatanController extends LocaleController { private static final Logger LOGGER = LoggerFactory.getLogger(JabatanController.class); - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - - @Override - public ResponseEntity getVO(Integer id) { - return null; - } + @Autowired + private JabatanService jabatanService; @RequestMapping(value = "/save-jabatan-internal/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody JabatanVO vo, HttpServletRequest request) { @@ -134,6 +123,54 @@ public class JabatanController extends LocaleController implements IB } } + @RequestMapping(value = "/save-master-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity saveJabatan(HttpServletRequest request, @Valid @RequestBody JabatanVO vo) { + try { + JabatanVO result = new JabatanVO(); + if (CommonUtil.isNotNullOrEmpty(vo.getId())) { + result = jabatanService.update(vo); + } else { + result = jabatanService.add(vo); + } + if (CommonUtil.isNotNullOrEmpty(result)) { + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + } else { + return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + } + } catch (ServiceVOException sve) { + LOGGER.error("Got exception {} when add/update master jabatan", sve.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got exception {} when add/update master jabatan", jse.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/get-master-jabatan", method = RequestMethod.GET) + public ResponseEntity>> getMasterJabatan(HttpServletRequest request, + @RequestParam(value = "namaJabatan", required = false) String namaJabatan, + @RequestParam(value = "jenisJabatanId", required = false) Integer idJenisJabatan, + @RequestParam(value = "unitKerjaId", required = false) Integer idUnitKerja) throws ParseException { + try { + List> result = jabatanService.findJabatan(namaJabatan, idJenisJabatan, idUnitKerja); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + } catch (ServiceVOException sve) { + LOGGER.error("Got exception {} when get master jabatan", sve.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got exception {} when get master jabatan", jse.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + } + } + @SuppressWarnings("unchecked") @RequestMapping(value = "/search-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllVOWithQueryString( @@ -147,16 +184,6 @@ public class JabatanController extends LocaleController implements IB return constructListPageResult(resultPageMap); } - @Override - public ResponseEntity addVO(JabatanVO vo) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - @RequestMapping(value = "/get-all-jabatan-struktural", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllJabatanStruktural(HttpServletRequest request) { List> result = null; @@ -188,11 +215,6 @@ public class JabatanController extends LocaleController implements IB return RestUtil.getJsonResponse(result, HttpStatus.OK); } - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - @RequestMapping(value = "/validate-nama-jabatan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> validateNamaJabatan(HttpServletRequest request, @RequestParam(value = "namaJabatan", required = true) String namaJabatan,