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

perbaikan service data mapping jabatan untuk entri pegawai baru

Browse Source
This commit is contained in:
salmanoe 2021-05-19 21:36:47 +07:00
parent 9afc8ef6f7
commit 61ccbe032e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -271,7 +271,7 @@ public class Master {
} }
public static final class SatuanIndikator { public static final class SatuanIndikator {
public static final Integer[] RATA_RATA = { 11743 }; public static final Integer[] PERCENTAGE = { 11743, 13585 };
} }
public static final class ShiftKerja { public static final class ShiftKerja {

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

@ -67,7 +67,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
*/ */
if (CommonUtil.isNotNullOrEmpty(resultModel)) { if (CommonUtil.isNotNullOrEmpty(resultModel)) {
List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak( List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak(
vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.RATA_RATA)); vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.PERCENTAGE));
if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) { if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) {
List<LogbookKinerja> models = new ArrayList<>(); List<LogbookKinerja> models = new ArrayList<>();
for (Map<String, Object> map : dataSatuanRatarata) { for (Map<String, Object> map : dataSatuanRatarata) {
@ -114,7 +114,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
*/ */
if (CommonUtil.isNotNullOrEmpty(resultModel)) { if (CommonUtil.isNotNullOrEmpty(resultModel)) {
List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak( List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak(
vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.RATA_RATA)); vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.PERCENTAGE));
if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) { if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) {
List<LogbookKinerja> models = new ArrayList<>(); List<LogbookKinerja> models = new ArrayList<>();
for (Map<String, Object> map : dataSatuanRatarata) { for (Map<String, Object> map : dataSatuanRatarata) {

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

@ -1063,9 +1063,14 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
if (CommonUtil.isNullOrEmpty(pejabatPenilai)) { if (CommonUtil.isNullOrEmpty(pejabatPenilai)) {
pejabatPenilai = pegawaiDao.getPegawaiByIdCustom(Master.EMPTY_DATA); pejabatPenilai = pegawaiDao.getPegawaiByIdCustom(Master.EMPTY_DATA);
} }
Map<String, Object> kelompokJabatan = nilaiKelompokJabatanDao Map<String, Object> kelompokJabatan = new HashMap<>();
.getDetailKelompokJabatanById(Integer.valueOf(map.get("gradeId").toString())); if (CommonUtil.isNotNullOrEmpty(map.get("gradeId"))) {
if (CommonUtil.isNullOrEmpty(kelompokJabatan)) { kelompokJabatan = nilaiKelompokJabatanDao
.getDetailKelompokJabatanById(Integer.valueOf(map.get("gradeId").toString()));
if (CommonUtil.isNullOrEmpty(kelompokJabatan)) {
kelompokJabatan = nilaiKelompokJabatanDao.getDetailKelompokJabatanById(Master.EMPTY_DATA);
}
} else {
kelompokJabatan = nilaiKelompokJabatanDao.getDetailKelompokJabatanById(Master.EMPTY_DATA); kelompokJabatan = nilaiKelompokJabatanDao.getDetailKelompokJabatanById(Master.EMPTY_DATA);
} }
Map<String, Object> sumberData = new HashMap<>(); Map<String, Object> sumberData = new HashMap<>();