Update LogbookKinerjaService
Perbaikan formula perhitungan P1 di dashboard pencatatan kinerja dan rekapitulasi penilaian kinerja
This commit is contained in:
parent
00d820567c
commit
6662d69892
@ -299,6 +299,7 @@ public class Master {
|
|||||||
public static final class Remunerasi {
|
public static final class Remunerasi {
|
||||||
public static final Integer[] JENIS_INDIKATOR = { 1, 2, 3 };
|
public static final Integer[] JENIS_INDIKATOR = { 1, 2, 3 };
|
||||||
|
|
||||||
|
public static final Double IK_STANDAR = 1.0;
|
||||||
public static final Double IKI_STANDAR = 1.0;
|
public static final Double IKI_STANDAR = 1.0;
|
||||||
public static final Double IKU = 1.0;
|
public static final Double IKU = 1.0;
|
||||||
|
|
||||||
|
|||||||
@ -888,11 +888,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
double targetRupiahP1 = nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1;
|
double targetRupiahP1 = nilaiJabatan * Master.Remunerasi.IK_STANDAR * pir * Master.Remunerasi.PERSEN_P1;
|
||||||
double targetRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * Master.Remunerasi.IKI_STANDAR * pir
|
double targetRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * Master.Remunerasi.IKI_STANDAR * pir
|
||||||
* Master.Remunerasi.PERSEN_P2;
|
* Master.Remunerasi.PERSEN_P2;
|
||||||
|
|
||||||
double capaianRupiahP1 = nilaiJabatan * iki * pir * Master.Remunerasi.PERSEN_P1;
|
double capaianRupiahP1 = nilaiJabatan * Master.Remunerasi.IK_STANDAR * pir * Master.Remunerasi.PERSEN_P1;
|
||||||
double capaianRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * iki * pir * Master.Remunerasi.PERSEN_P2;
|
double capaianRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * iki * pir * Master.Remunerasi.PERSEN_P2;
|
||||||
|
|
||||||
if (CommonUtil.isNotNullOrEmpty(idJabatan)) {
|
if (CommonUtil.isNotNullOrEmpty(idJabatan)) {
|
||||||
@ -2720,7 +2720,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
double p1 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Double.valueOf(rd.get("iki").toString())
|
double p1 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Master.Remunerasi.IK_STANDAR
|
||||||
* Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P1;
|
* Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P1;
|
||||||
double p2 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Double.valueOf(rd.get("iki").toString())
|
double p2 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Double.valueOf(rd.get("iki").toString())
|
||||||
* Master.Remunerasi.IKU * Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P2;
|
* Master.Remunerasi.IKU * Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P2;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user