salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- menghilangkan data jabatan anjab

Browse Source 
- menyesuaikan master indikator dengan konsep jabatan spesifik unit kerjanya
- menyesuaikan evaluasi jabatan dengan konsep jabatan spesifik unit kerjanya
- menyesuaikan rekam data pegawai dengan konsep jabatan spesifik unit kerjanya
This commit is contained in:
salmanoe 2021-04-09 13:57:03 +07:00
parent 3205c29c08
commit dcfc0f2cc3
10 changed files with 50 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaJabatanDao.java
View File

@ -29,16 +29,15 @@ public interface IndikatorKinerjaJabatanDao extends PagingAndSortingRepository<I
@Query("select new Map(jj.id as jenisJabatanId,jj.jenisJabatan as jenisJabatan,"
+ "jb.id as jabatanId,jb.namaJabatan as namaJabatan) " + "from Jabatan jb "
+ "inner join jb.jenisJabatan jj " + "where jb.statusEnabled is true " + "and jb.kdJabatan = 'ANJAB' "
+ "order by jb.namaJabatan, jb.id")
List<Map<String, Object>> findAllJabatanAnjab();
+ "inner join jb.jenisJabatan jj " + "where jb.statusEnabled is true " + "order by jb.namaJabatan, jb.id")
List<Map<String, Object>> 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<Map<String, Object>> findAllByIndikator(@Param("indikatorId") Integer idIndikator);

32
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JabatanDao.java
View File

@ -35,21 +35,19 @@ public interface JabatanDao extends PagingAndSortingRepository<Jabatan, Integer>
@Query("SELECT model from Jabatan model where model.jenisJabatanId = :jenisJabatanId ")
List<Jabatan> 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<Map<String, Object>> getJabatanByJenisJabatan(@Param("jenisJabatanId") Integer jenisJabatanId);
@Query(strQryJabatanByJenis + kdJabatanAnjab + sortNamaJabatan)
List<Map<String, Object>> getJabatanByJenisJabatanAnjab(@Param("jenisJabatanId") Integer jenisJabatanId,
@Param("kdJabatan") String kdJabatan);
@Query(strQryJabatanByJenis + kdJabatanNonanjab + sortNamaJabatan)
List<Map<String, Object>> getJabatanByJenisJabatanNonanjab(@Param("jenisJabatanId") Integer jenisJabatanId);
@Query(strJabatanByJenis + byUnitKerja + sortNamaJabatan)
List<Map<String, Object>> 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<Jabatan, Integer>
List<Map<String, Object>> 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<Map<String, Object>> 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<String> 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,"

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
View File

@ -383,14 +383,14 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository<MapPegaw
+ "from MapPegawaiJabatanToUnitKerja mj, EvaluasiJabatan ej " + "inner join mj.jabatan j "
+ "inner join ej.grade nj " + "where mj.jabatanId = ej.jabatanId " + "and ej.jabatanId = j.id "
+ "and mj.statusEnabled is true " + "and ej.statusEnabled is true " + "and mj.pegawaiId = :pegawaiId "
+ "and j.kdJabatan = 'ANJAB' " + "order by ej.totalNilai desc, ej.tglHitung desc")
+ "order by ej.totalNilai desc, ej.tglHitung desc")
List<Map<String, Object>> 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<Map<String, Object>> findEvaluasiJabatanByAllJabatanPegawaiBaru(
@Param("listJabatanId") List<Integer> listIdJabatan);

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
View File

@ -54,8 +54,9 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
+ "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan j "
+ "inner join j.kelompokJabatan kj " + "inner join pg.detailKelompokJabatan dkj "
+ "where kj.id = dkj.kelompokJabatanId " + "and mj.statusEnabled is true " + "and pg.statusEnabled is true "
+ "and j.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) "
+ "and j.kdJabatan = 'ANJAB' " + "order by pg.id asc, " + "pg.nilaiJabatan desc")
public List<Map<String, Object>> findPenempatanEvaluasiJabatan(@Param("listKategoriId") List<Integer> idListKategori);
+ "and j.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) " + "order by pg.id asc, "
+ "pg.nilaiJabatan desc")
public List<Map<String, Object>> findPenempatanEvaluasiJabatan(
@Param("listKategoriId") List<Integer> idListKategori);
}

8
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/JabatanService.java
View File

@ -17,7 +17,9 @@ public interface JabatanService extends BaseVoService<Jabatan, JabatanVO, Intege
List<Map<String, Object>> getListJabatanFungsionalStruktural();
List<Map<String, Object>> getJabatanByJenisJabatan(Integer idJenisJabatan, String kdJabatan);
List<Map<String, Object>> findModelJabatan(Integer idJenisJabatan);
List<Map<String, Object>> findModelJabatan(Integer idJenisJabatan, Integer idUnitKerja);
Map<String, Object> saveKelompokJabatan(KelompokJabatanVO vo);
@ -27,10 +29,6 @@ public interface JabatanService extends BaseVoService<Jabatan, JabatanVO, Intege
Map<String, Object> validateNamaJabatan(String namaJabatan, Integer idJenisJabatan);
List<Map<String, Object>> getListJabatanAnjabByUnitKerja(String unitKerja);
List<String> getListUnitKerjaAnjab();
List<Map<String, Object>> findJabatan(String namaJabatan, Integer idJenisJabatan, Integer idUnitKerja);
}

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndikatorKinerjaJabatanServiceImpl.java
View File

@ -350,7 +350,7 @@ public class IndikatorKinerjaJabatanServiceImpl extends BaseVoServiceImpl implem
List<Map<String, Object>> data = new ArrayList<>();
List<Integer> listIdJabatan = new ArrayList<>();
List<Map<String, Object>> result = indikatorKinerjaJabatanDao.findAllJabatanAnjab();
List<Map<String, Object>> result = indikatorKinerjaJabatanDao.findAllJabatan();
List<Map<String, Object>> allMap = indikatorKinerjaJabatanDao.findAllByIndikator(idIndikator);
for (Map<String, Object> map : allMap) {
if (!listIdJabatan.contains(map.get("jabatanId"))) {

34
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JabatanServiceImpl.java
View File

@ -231,14 +231,16 @@ public class JabatanServiceImpl extends BaseVoServiceImpl implements JabatanServ
}
@Override
public List<Map<String, Object>> getJabatanByJenisJabatan(Integer idJenisJabatan, String kdJabatan) {
List<Map<String, Object>> result = new ArrayList<>();
public List<Map<String, Object>> findModelJabatan(Integer idJenisJabatan) {
List<Map<String, Object>> result = jabatanDao.getJabatanByJenisJabatan(idJenisJabatan);
return result;
}
@Override
public List<Map<String, Object>> findModelJabatan(Integer idJenisJabatan, Integer idUnitKerja) {
List<Map<String, Object>> 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<Map<String, Object>> getListJabatanAnjabByUnitKerja(String unitKerja) {
List<Map<String, Object>> result = new ArrayList<>();
result = jabatanDao.findJabatanAnjabByUnitKerja(unitKerja);
return result;
}
@Override
public List<String> getListUnitKerjaAnjab() {
List<String> result = new ArrayList<>();
result = jabatanDao.findUnitKerjaAnjab();
return result;
}
@Override
public List<Map<String, Object>> findJabatan(String namaJabatan, Integer idJenisJabatan, Integer idUnitKerja) {
List<Map<String, Object>> result = new ArrayList<>();

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
View File

@ -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);
}

40
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java
View File

@ -205,7 +205,7 @@ public class JabatanController extends LocaleController<JabatanVO> {
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
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<JabatanVO> {
}
}
@RequestMapping(value = "/get-list-jabatan-anjab-by-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Map<String, Object>>> getAllJabatanAnjabByUnitKerja(HttpServletRequest request,
@RequestParam(value = "unitKerja", required = true) String unitKerja) {
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
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<Map<String, Object>> validateNamaJabatan(HttpServletRequest request) {
try {
Map<String, Object> result = new HashMap<String, Object>();
List<String> 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);
}
}
}

21
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
View File

@ -4880,11 +4880,10 @@ public class SdmController extends LocaleController<AkunVO> {
@RequestMapping(value = "/get-all-jabatan-by-jenis-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Map<String, Object>>> 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<Map<String, Object>> 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<AkunVO> {
return RestUtil.getJsonResponse(result, HttpStatus.OK);
}
@RequestMapping(value = "/get-jabatan-by-jenis-dan-unit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Map<String, Object>>> getJabatanByJenisDanUnitKerja(HttpServletRequest request,
@RequestParam(value = "jenisJabatanId", required = true) Integer idJenisJabatan,
@RequestParam(value = "unitKerjaId", required = true) Integer idUnitKerja) {
List<Map<String, Object>> 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<Map<String, Object>> saveKelompokJabatan(@Valid @RequestBody KelompokJabatanVO vo,
HttpServletRequest request) throws ParseException {