perbaikan fungsi mapping kontrak kinerja individu saat load data grid
This commit is contained in:
parent
7742e1d9d6
commit
2b08380318
@ -43,11 +43,11 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
|
||||
+ "from IndikatorKinerjaJabatan ikt " + "inner join ikt.indikatorKinerja ikm "
|
||||
+ "inner join ikm.satuanIndikator si " + "where ikt.statusEnabled is true "
|
||||
+ "and ikm.statusEnabled is true " + "and ikm.statusVerifikasi is true " + "and si.statusEnabled is true "
|
||||
+ "and ikt.jabatanId = :jabatanId "
|
||||
+ "and to_char(ikt.tanggalMulaiBerlaku,'yyyy-MM') <= to_char(now(),'yyyy-MM') "
|
||||
+ "and ikt.jabatanId = :jabatanId " + "and to_char(ikt.tanggalMulaiBerlaku,'yyyy-MM') <= :bulan "
|
||||
+ "order by ikm.jenisIndikator, ikm.namaIndikator, "
|
||||
+ "ikt.tanggalMulaiBerlaku desc, ikt.tanggalPembaharuanData desc")
|
||||
List<Map<String, Object>> findIndikatorByJabatan(@Param("jabatanId") Integer idJabatan);
|
||||
List<Map<String, Object>> findIndikatorByJabatan(@Param("jabatanId") Integer idJabatan,
|
||||
@Param("bulan") String bulan);
|
||||
|
||||
@Query("select new Map(lkh.noRec as noRec,ikm.jenisIndikator as jenisIndikatorId,"
|
||||
+ "ikm.id as indikatorId,ikm.namaIndikator as namaIndikator,"
|
||||
|
||||
@ -254,7 +254,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
||||
List<Integer> listIdIndikator = new ArrayList<>();
|
||||
DateFormat df = new SimpleDateFormat("yyyy-MM");
|
||||
|
||||
List<Map<String, Object>> listMap = logbookKinerjaDao.findIndikatorByJabatan(idJabatan);
|
||||
List<Map<String, Object>> listMap = logbookKinerjaDao.findIndikatorByJabatan(idJabatan,
|
||||
df.format(new Date(bulan)));
|
||||
List<Map<String, Object>> data = logbookKinerjaDao.findKontrakKinerja(idPegawai, idJabatan,
|
||||
df.format(new Date(bulan)));
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user