- perbaikan menu rekap evaluasi jabatan
- membuat service histori evaluasi jabatan
This commit is contained in:
parent
87af2d01ab
commit
a4bf80d411
@ -41,8 +41,15 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
|
||||
NilaiKelompokJabatan findDetailKelompokJabatan(@Param("idJabatan") Integer idJabatan,
|
||||
@Param("totalNilai") Integer totalNilai);
|
||||
|
||||
@Query("select new Map(ej.tahun || '-' || ej.bulan as periodePerhitungan,"
|
||||
+ "j.namaJabatan as namaJabatan,nj.grade as grade,nj.detailKelompokJabatan as kelompokJabatan,"
|
||||
@Query("select distinct new Map(j.id as idJabatan,j.namaExternal as unitKerja,j.namaJabatan as namaJabatan) " + "from EvaluasiJabatan ej "
|
||||
+ "left join ej.jabatan j " + "where ej.statusEnabled is true "
|
||||
+ "order by j.namaExternal, j.namaJabatan asc")
|
||||
List<Map<String, Object>> findDistinctEvaluasiJabatan();
|
||||
|
||||
@Query("select new Map(ej.tahun as tahun,ej.bulan as bulan,ej.tahun || '-' || ej.bulan as periodePerhitungan,"
|
||||
+ "ej.tglHitung as tglHitung,to_char(ej.tglHitung, 'dd-MM-yyyy HH:mm:ss') as tglHitungFormatted,"
|
||||
+ "j.namaExternal as unitKerja,j.id as idJabatan,j.namaJabatan as namaJabatan,"
|
||||
+ "nj.grade as grade,nj.detailKelompokJabatan as kelompokJabatan,"
|
||||
+ "f1.profile as f1,f2.profile as f2,f3.profile as f3,"
|
||||
+ "f4.profile as f4,f5.profile as f5,f7.profile as f7,"
|
||||
+ "f8.profile as f8,f9.profile as f9,f10.profile as f10,"
|
||||
@ -57,7 +64,7 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
|
||||
+ "left join ej.faktorF ff " + "left join ej.faktorG fg " + "left join ej.faktorH fh "
|
||||
+ "left join ej.faktorI fi " + "left join ej.faktorJ fj " + "left join ej.faktorK fk "
|
||||
+ "left join ej.faktorL fl " + "where ej.statusEnabled is true "
|
||||
+ "order by j.namaJabatan, ej.tahun || '-' || ej.bulan")
|
||||
+ "order by j.namaExternal, j.namaJabatan asc, ej.tglHitung desc")
|
||||
List<Map<String, Object>> findAllEvaluasiJabatan();
|
||||
|
||||
}
|
||||
|
||||
@ -25,6 +25,8 @@ public interface EvaluasiJabatanService {
|
||||
|
||||
Map<String, Object> findEvaluasiJabatanTahun(Integer tahun);
|
||||
|
||||
List<Map<String, Object>> findActiveEvaluasiJabatan();
|
||||
|
||||
List<Map<String, Object>> findAllEvaluasiJabatan();
|
||||
|
||||
}
|
||||
|
||||
@ -523,6 +523,25 @@ public class EvaluasiJabatanServiceImpl extends BaseVoServiceImpl implements Eva
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> findActiveEvaluasiJabatan() {
|
||||
List<Map<String, Object>> result = new ArrayList<>();
|
||||
|
||||
List<Map<String, Object>> distinctData = evaluasiJabatanDao.findDistinctEvaluasiJabatan();
|
||||
List<Map<String, Object>> data = evaluasiJabatanDao.findAllEvaluasiJabatan();
|
||||
|
||||
for (Map<String, Object> param : distinctData) {
|
||||
for (Map<String, Object> map : data) {
|
||||
if (param.get("idJabatan").equals(map.get("idJabatan"))) {
|
||||
result.add(map);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> findAllEvaluasiJabatan() {
|
||||
List<Map<String, Object>> result = new ArrayList<>();
|
||||
|
||||
@ -5728,7 +5728,7 @@ public class SdmController extends LocaleController<AkunVO> {
|
||||
@RequestMapping(value = "/get-all-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getAllEvaluasiJabatan(HttpServletRequest request) {
|
||||
try {
|
||||
List<Map<String, Object>> result = evaluasiJabatanService.findAllEvaluasiJabatan();
|
||||
List<Map<String, Object>> result = evaluasiJabatanService.findActiveEvaluasiJabatan();
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
@ -5743,5 +5743,24 @@ public class SdmController extends LocaleController<AkunVO> {
|
||||
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
|
||||
}
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/get-histori-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<List<Map<String, Object>>> getHistoriEvaluasiJabatan(HttpServletRequest request) {
|
||||
try {
|
||||
List<Map<String, Object>> result = evaluasiJabatanService.findAllEvaluasiJabatan();
|
||||
if (null != result)
|
||||
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
|
||||
getMessage(MessageResource.LABEL_SUCCESS, request));
|
||||
return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
|
||||
} catch (ServiceVOException e) {
|
||||
LOGGER.error("Got exception {} when get histori evaluasi jabatan", 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 histori evaluasi jabatan", jse.getMessage());
|
||||
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
|
||||
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user