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

- perbaikan service simpan nilai jabatan ke data pegawai dan mapping jabatan di menu evaluasi jabatan mengikuti tgl hitung terakhir

Browse Source 
- pembuatan service validasi hapus kontrak kinerja jika sudah ada catatan kegiatan harian
- perbaikan service penempatan remunerasi mengikuti perbaikan tanggal hitung nilai jabatan terakhir dan nilai jabatan tertinggi
- perbaikan service dashboard kinerja untuk pegawai pkwt dan pegawai belum evaluasi jabatan
- perbaikan service hitung sisa cuti jika lebih dari 24 hari
This commit is contained in:
salmanoe 2021-04-27 07:10:37 +07:00
parent 98d51dda0f
commit ad6de66647
14 changed files with 104 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
View File

@ -69,15 +69,12 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
List<Map<String, Object>> findAllEvaluasiJabatan();
@Query("select distinct pg.id " + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and mj.jabatanId = :jabatanId "
+ "and pg.kategoryPegawaiId in (:listKategoriId)")
List<Integer> findAllPegawaiRemunByJabatan(@Param("jabatanId") Integer idJabatan,
@Param("listKategoriId") List<Integer> idListKategori);
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and mj.jabatanId = :jabatanId")
List<Integer> findAllPegawaiRemunByJabatan(@Param("jabatanId") Integer idJabatan);
@Query("select distinct mj.id " + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and mj.jabatanId = :jabatanId "
+ "and pg.kategoryPegawaiId in (:listKategoriId)")
List<Integer> findAllJabatanRemun(@Param("listKategoriId") List<Integer> idListKategori);
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and mj.jabatanId = :jabatanId")
List<Integer> findAllMappingJabatanRemun(@Param("jabatanId") Integer idJabatan);
@Query("select new Map(ej.gradeId as gradeId,ej.totalNilai as totalNilai) " + "from EvaluasiJabatan ej "
+ "where ej.statusEnabled is true " + "and ej.jabatanId = :jabatanId " + "order by ej.tglHitung desc")

9
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDetailDao.java
View File

@ -31,13 +31,18 @@ public interface LogbookKinerjaDetailDao extends PagingAndSortingRepository<Logb
List<Map<String, Object>> findWorkingRecord(@Param("pegawaiId") Integer idPegawai,
@Param("jabatanId") Integer idJabatan, @Param("bulan") String bulan);
@Query("select new Map(lkd.logbookIndikatorId as logbookId,avg(lkd.capaian) as avgCapaian,ikm.satuanIndikatorId as satuanId) "
@Query("select new Map(lkd.logbookKinerjaId as logbookId,avg(lkd.capaian) as avgCapaian,ikm.satuanIndikatorId as satuanId) "
+ "from LogbookKinerjaDetail lkd " + "inner join lkd.logbookKinerja lk "
+ "inner join lk.indikatorKinerja ikm " + "where lkd.statusEnabled is true "
+ "and lkd.statusVerifikasi is true " + "and lk.statusEnabled is true " + "and ikm.statusEnabled is true "
+ "and lk.noRec = :noRec " + "and ikm.satuanIndikatorId in (:listSatuanId) "
+ "group by lkd.logbookIndikatorId, ikm.satuanIndikatorId")
+ "group by lkd.logbookKinerjaId, ikm.satuanIndikatorId")
List<Map<String, Object>> findAvgCapaianByKontrak(@Param("noRec") String noRec,
@Param("listSatuanId") List<Integer> listIdSatuan);
@Query("select new Map(lkd.noRec as noRec,lkd.namaKegiatan as namaKegiatan) " + "from LogbookKinerjaDetail lkd "
+ "where lkd.logbookKinerjaId = :logbookNoRec " + "and lkd.statusEnabled is true "
+ "and lkd.statusVerifikasi is true")
List<Map<String, Object>> findUsedWorkingRecordByKontrak(@Param("logbookNoRec") String logbookNoRec);
}

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

@ -394,7 +394,7 @@ 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 "
+ "order by ej.totalNilai desc, ej.tglHitung desc")
+ "order by 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,"

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

@ -54,10 +54,11 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
+ "from MapPegawaiJabatanToUnitKerja mj, EvaluasiJabatan ej " + "inner join mj.pegawai pg "
+ "inner join mj.jabatan j " + "inner join j.unitKerja uk " + "inner join ej.grade dkj "
+ "inner join dkj.kelompokJabatan kj " + "where mj.jabatanId = ej.jabatanId and j.id = ej.jabatanId "
+ "and mj.jabatanId = j.id " + "and mj.unitKerjaPegawaiId = uk.id " + "and mj.statusEnabled is true "
+ "and ej.statusEnabled is true " + "and pg.statusEnabled is true " + "and j.statusEnabled is true "
+ "and uk.statusEnabled is true " + "and dkj.statusEnabled is true " + "and kj.statusEnabled is true "
+ "and pg.kategoryPegawaiId in (:listKategoriId) " + "order by pg.namaLengkap, pg.id, ej.totalNilai desc")
+ "and mj.jabatanId = j.id " + "and mj.unitKerjaPegawaiId = uk.id " + "and mj.gradeId = dkj.id "
+ "and mj.statusEnabled is true " + "and ej.statusEnabled is true " + "and pg.statusEnabled is true "
+ "and j.statusEnabled is true " + "and uk.statusEnabled is true " + "and dkj.statusEnabled is true "
+ "and kj.statusEnabled is true " + "and pg.kategoryPegawaiId in (:listKategoriId) "
+ "order by pg.namaLengkap, pg.id, ej.totalNilai desc")
public List<Map<String, Object>> findPenempatanEvaluasiJabatan(
@Param("listKategoriId") List<Integer> idListKategori);

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

@ -16,4 +16,6 @@ public interface LogbookKinerjaDetailService
public List<Map<String, Object>> findAksesPegawai(Integer idPegawai) throws JpaSystemException;
public List<Map<String, Object>> findUsedWorkingRecordByKontrak(String logbookNoRec) throws JpaSystemException;
}

28
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiJabatanServiceImpl.java
View File

@ -178,19 +178,15 @@ public class EvaluasiJabatanServiceImpl extends BaseVoServiceImpl implements Eva
/**
* Update data pegawai
*/
List<Integer> listIdPegawai = evaluasiJabatanDao.findAllPegawaiRemunByJabatan(
model.getJabatan().getId(), Arrays.asList(Master.KategoryPegawai.REMUN));
List<Integer> listIdPegawai = evaluasiJabatanDao
.findAllPegawaiRemunByJabatan(model.getJabatan().getId());
List<Pegawai> listPegawai = new ArrayList<>();
for (Integer idPegawai : listIdPegawai) {
Pegawai pegawai = pegawaiDao.findOne(idPegawai);
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);
}
pegawai.setNilaiJabatan(model.getTotalNilai());
pegawai.setGrade(Double.valueOf(nilaiKelompokJabatan.getGradeDesc()));
pegawai.setDetailKelompokJabatan(nilaiKelompokJabatan);
listPegawai.add(pegawai);
}
if (CommonUtil.isNotNullOrEmpty(listPegawai)) {
pegawaiDao.save(listPegawai);
@ -200,16 +196,12 @@ public class EvaluasiJabatanServiceImpl extends BaseVoServiceImpl implements Eva
*/
List<MapPegawaiJabatanToUnitKerja> listMapJabatan = new ArrayList<>();
List<Integer> listIdMapJabatan = evaluasiJabatanDao
.findAllJabatanRemun(Arrays.asList(Master.KategoryPegawai.REMUN));
.findAllMappingJabatanRemun(model.getJabatan().getId());
for (Integer id : listIdMapJabatan) {
MapPegawaiJabatanToUnitKerja mj = mapPegawaiJabatanToUnitKerjaDao.findOne(id);
if ((CommonUtil.isNotNullOrEmpty(mj.getNilaiJabatan())
&& mj.getNilaiJabatan() < model.getTotalNilai())
|| CommonUtil.isNullOrEmpty(mj.getNilaiJabatan())) {
mj.setNilaiJabatan(model.getTotalNilai());
mj.setGrade(nilaiKelompokJabatan);
listMapJabatan.add(mj);
}
mj.setNilaiJabatan(model.getTotalNilai());
mj.setGrade(nilaiKelompokJabatan);
listMapJabatan.add(mj);
}
if (CommonUtil.isNotNullOrEmpty(listMapJabatan)) {
mapPegawaiJabatanToUnitKerjaDao.save(listMapJabatan);

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java
View File

@ -206,4 +206,11 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
return result;
}
@Override
public List<Map<String, Object>> findUsedWorkingRecordByKontrak(String logbookNoRec) throws JpaSystemException {
List<Map<String, Object>> result = logbookKinerjaDetailDao.findUsedWorkingRecordByKontrak(logbookNoRec);
return result;
}
}

22
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
View File

@ -322,7 +322,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> data = anggaranRemunerasiDao.findTahunIniByPegawai(idPegawai, idJabatan);
result = data.get(0);
if (CommonUtil.isNotNullOrEmpty(data) && data.size() > 0) {
result = data.get(0);
}
return result;
}
@ -334,6 +336,10 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
List<Map<String, Object>> listJenisIndikator = new ArrayList<>();
DateFormat df = new SimpleDateFormat("yyyy-MM");
double totAllPersen = 0.0;
double nilaiJabatan = 0.0;
double pir = 0.0;
double plafonGaji = 0.0;
double plafonInsentif = 0.0;
DecimalFormatSymbols formatRp = new DecimalFormatSymbols();
formatRp.setCurrencySymbol("Rp");
@ -347,8 +353,14 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
df.format(new Date(bulan)));
Map<String, Object> anggaran = findAnggaranRemunerasi(idPegawai, idJabatan);
double nilaiJabatan = Double.valueOf(rs.get(0).get("nilaiJabatan").toString());
double pir = Double.valueOf(anggaran.get("pir").toString());
if (CommonUtil.isNotNullOrEmpty(rs) && rs.size() > 0) {
nilaiJabatan = Double.valueOf(rs.get(0).get("nilaiJabatan").toString());
}
if (CommonUtil.isNotNullOrEmpty(anggaran)) {
pir = Double.valueOf(anggaran.get("pir").toString());
plafonGaji = Double.valueOf(anggaran.get("plafonGaji").toString());
plafonInsentif = Double.valueOf(anggaran.get("plafonInsentif").toString());
}
for (String ji : Arrays.asList(Master.JENIS_INDIKATOR)) {
double hasil = 0.0;
@ -396,13 +408,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
result.put("rupiahCapaianP1Format", kursINA.format(
totAllPersen / 100.0 * nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1)
.toString());
result.put("plafonP1", kursINA.format(Double.valueOf(anggaran.get("plafonGaji").toString())).toString());
result.put("plafonP1", kursINA.format(plafonGaji).toString());
result.put("rupiahCapaianP2", totAllPersen / 100.0 * nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir
* Master.Remunerasi.PERSEN_P2);
result.put("rupiahCapaianP2Format", kursINA.format(
totAllPersen / 100.0 * nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P2)
.toString());
result.put("plafonP2", kursINA.format(Double.valueOf(anggaran.get("plafonInsentif").toString())).toString());
result.put("plafonP2", kursINA.format(plafonInsentif).toString());
result.put("rupiahTargetP1", nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1);
result.put("rupiahTargetFormatP1", kursINA
.format(nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1).toString());

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

@ -171,10 +171,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
// Find nilai jabatan dan grade
List<Map<String, Object>> ej = evaluasiJabatanDao
.findEvaluasiByJabatan(vo.getJabatan().getId());
if (CommonUtil.isNotNullOrEmpty(ej)
&& Arrays.asList(Master.KategoryPegawai.REMUN).contains(idKategoryPegawai)
&& (CommonUtil.isNullOrEmpty(map.getNilaiJabatan()) || map.getNilaiJabatan() < Double
.valueOf(ej.get(0).get("totalNilai").toString()))) {
if (CommonUtil.isNotNullOrEmpty(ej)) {
map.setNilaiJabatan(Double.valueOf(ej.get(0).get("totalNilai").toString()));
NilaiKelompokJabatan nj = new NilaiKelompokJabatan();
nj.setId(Integer.valueOf(ej.get(0).get("gradeId").toString()));
@ -262,10 +259,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
// Find nilai jabatan dan grade
List<Map<String, Object>> ej = evaluasiJabatanDao
.findEvaluasiByJabatan(vo.getJabatan().getId());
if (CommonUtil.isNotNullOrEmpty(ej)
&& Arrays.asList(Master.KategoryPegawai.REMUN).contains(idKategoryPegawai)
&& (CommonUtil.isNullOrEmpty(map.getNilaiJabatan()) || map.getNilaiJabatan() < Double
.valueOf(ej.get(0).get("totalNilai").toString()))) {
if (CommonUtil.isNotNullOrEmpty(ej)) {
map.setNilaiJabatan(Double.valueOf(ej.get(0).get("totalNilai").toString()));
NilaiKelompokJabatan nj = new NilaiKelompokJabatan();
nj.setId(Integer.valueOf(ej.get(0).get("gradeId").toString()));
@ -439,10 +433,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
// Find nilai jabatan dan grade
List<Map<String, Object>> ej = evaluasiJabatanDao
.findEvaluasiByJabatan(vo.getJabatan().getId());
if (CommonUtil.isNotNullOrEmpty(ej)
&& Arrays.asList(Master.KategoryPegawai.REMUN).contains(idKategoryPegawai)
&& (CommonUtil.isNullOrEmpty(map.getNilaiJabatan()) || map.getNilaiJabatan() < Double
.valueOf(ej.get(0).get("totalNilai").toString()))) {
if (CommonUtil.isNotNullOrEmpty(ej)) {
map.setNilaiJabatan(Double.valueOf(ej.get(0).get("totalNilai").toString()));
NilaiKelompokJabatan nj = new NilaiKelompokJabatan();
nj.setId(Integer.valueOf(ej.get(0).get("gradeId").toString()));
@ -469,10 +460,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
// Find nilai jabatan dan grade
List<Map<String, Object>> ej = evaluasiJabatanDao.findEvaluasiByJabatan(vo.getJabatan().getId());
if (CommonUtil.isNotNullOrEmpty(ej)
&& Arrays.asList(Master.KategoryPegawai.REMUN).contains(idKategoryPegawai)
&& (CommonUtil.isNullOrEmpty(map.getNilaiJabatan()) || map.getNilaiJabatan() < Double
.valueOf(ej.get(0).get("totalNilai").toString()))) {
if (CommonUtil.isNotNullOrEmpty(ej)) {
map.setNilaiJabatan(Double.valueOf(ej.get(0).get("totalNilai").toString()));
NilaiKelompokJabatan nj = new NilaiKelompokJabatan();
nj.setId(Integer.valueOf(ej.get(0).get("gradeId").toString()));
@ -684,10 +672,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
// Find nilai jabatan dan grade
List<Map<String, Object>> ej = evaluasiJabatanDao.findEvaluasiByJabatan(vo.getJabatan().getId());
if (CommonUtil.isNotNullOrEmpty(ej)
&& Arrays.asList(Master.KategoryPegawai.REMUN).contains(idKategoryPegawai)
&& (CommonUtil.isNullOrEmpty(map.getNilaiJabatan()) || map.getNilaiJabatan() < Double
.valueOf(ej.get(0).get("totalNilai").toString()))) {
if (CommonUtil.isNotNullOrEmpty(ej)) {
map.setNilaiJabatan(Double.valueOf(ej.get(0).get("totalNilai").toString()));
NilaiKelompokJabatan nj = new NilaiKelompokJabatan();
nj.setId(Integer.valueOf(ej.get(0).get("gradeId").toString()));
@ -772,12 +757,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) {
Map<String, Object> evaluasiJabatan = this.getEvaluasiJabatanByPegawai(vo.getPegawai().getId());
pegawai.setId(vo.getPegawai().getId());
if ((CommonUtil.isNotNullOrEmpty(evaluasiJabatan)
&& CommonUtil.isNullOrEmpty(pegawai.getNilaiJabatan()))
|| (CommonUtil.isNotNullOrEmpty(evaluasiJabatan)
&& CommonUtil.isNotNullOrEmpty(pegawai.getNilaiJabatan())
&& pegawai.getNilaiJabatan() < Double
.valueOf(evaluasiJabatan.get("nilaiJabatan").toString()))) {
if (CommonUtil.isNotNullOrEmpty(evaluasiJabatan)) {
pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString()));
pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString()));
NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan();

15
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
View File

@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -2383,10 +2384,20 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
@Override
public Map<String, Object> getEvaluasiJabatanByPegawai(Integer idPegawai) {
Map<String, Object> result = new HashMap<>();
List<Integer> listIdJabatan = new ArrayList<>();
List<Map<String, Object>> dataFilter = new ArrayList<>();
List<Map<String, Object>> data = mapPegawaiJabatanToUnitKerjaDao.findEvaluasiJabatanByPegawai(idPegawai);
if (CommonUtil.isNotNullOrEmpty(data)) {
result = data.get(0);
for (Map<String, Object> map : data) {
if (!listIdJabatan.contains(map.get("idJabatan"))) {
listIdJabatan.add(Integer.valueOf(map.get("idJabatan").toString()));
dataFilter.add(map);
}
}
if (CommonUtil.isNotNullOrEmpty(dataFilter)) {
dataFilter.sort(Comparator.comparing(m -> (Double) m.get("nilaiJabatan")));
result = dataFilter.get(dataFilter.size() - 1);
}
return result;

3
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
View File

@ -744,6 +744,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
} else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) {
sisaCutiN2 = 0;
} else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2)
+ difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) > 6 && jCutiN1) {
sisaCutiN2 = 0;
} else {
sisaCutiN2 = dataCutiN2 - jatahCutiTerpakaiN2;
}

10
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LogbookKinerjaDetail.java
View File

@ -46,7 +46,7 @@ public class LogbookKinerjaDetail extends BaseTransaction {
private LogbookKinerja logbookKinerja;
@Column(name = "objectlogbookkinerjafk", insertable = false, updatable = false, nullable = true)
private String logbookIndikatorId;
private String logbookKinerjaId;
public String getNamaKegiatan() {
return namaKegiatan;
@ -96,12 +96,12 @@ public class LogbookKinerjaDetail extends BaseTransaction {
this.logbookKinerja = logbookKinerja;
}
public String getLogbookIndikatorId() {
return logbookIndikatorId;
public String getLogbookKinerjaId() {
return logbookKinerjaId;
}
public void setLogbookIndikatorId(String logbookIndikatorId) {
this.logbookIndikatorId = logbookIndikatorId;
public void setLogbookKinerjaId(String logbookKinerjaId) {
this.logbookKinerjaId = logbookKinerjaId;
}
}

10
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/LogbookKinerjaDetailVO.java
View File

@ -25,7 +25,7 @@ public class LogbookKinerjaDetailVO extends BaseTransactionVO {
@Caption(value = "Logbook Kinerja")
private LogbookKinerjaVO logbookKinerja;
private String logbookIndikatorId;
private String logbookKinerjaId;
public String getNamaKegiatan() {
return namaKegiatan;
@ -75,12 +75,12 @@ public class LogbookKinerjaDetailVO extends BaseTransactionVO {
this.logbookKinerja = logbookKinerja;
}
public String getLogbookIndikatorId() {
return logbookIndikatorId;
public String getLogbookKinerjaId() {
return logbookKinerjaId;
}
public void setLogbookIndikatorId(String logbookIndikatorId) {
this.logbookIndikatorId = logbookIndikatorId;
public void setLogbookKinerjaId(String logbookKinerjaId) {
this.logbookKinerjaId = logbookKinerjaId;
}
}

19
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
View File

@ -923,4 +923,23 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
}
}
@RequestMapping(value = "/kegiatan-harian-kontrak", method = RequestMethod.GET)
public ResponseEntity<List<Map<String, Object>>> getUsedWorkingRecordByKontrak(HttpServletRequest request,
@RequestParam(value = "logbookKinerjaId", required = true) String idLogbookKinerja) throws ParseException {
try {
List<Map<String, Object>> result = logbookKinerjaDetailService.findUsedWorkingRecordByKontrak(idLogbookKinerja);
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 kontrak sudah dipakai di working record", 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 kontrak sudah dipakai di working record", jse.getMessage());
addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
}
}
}