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

- perbaikan cetakan cuti untuk aturan golongan pns dan dirut

Browse Source 
- perbaikan konstanta variabel di service dashboard kinerja
This commit is contained in:
salmanoe 2021-03-28 19:43:13 +07:00
parent db0fe43262
commit 0eb9db8912
5 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,6 +241,11 @@ 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 BOBOT_KUANTITAS = 40.0;
public static final Double BOBOT_KUALITAS = 30.0;
public static final Double BOBOT_PERILAKU = 30.0;
public static final Double IKI_STANDAR = 1.0;
} }
public static final class Ruangan { public static final class Ruangan {

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

@ -90,7 +90,8 @@ public interface ReportService extends BaseVoService<Pasien, PasienVO, Integer>
Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2); Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2);
public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idUnitKerja, public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2); Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2,
String atasanDireksi);
public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, String atasan1, String nipPnsAtasan1, public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, String atasan1, String nipPnsAtasan1,
String jabatanAtasan1, String atasan2, String nipPnsAtasan2, String jabatanAtasan2, Integer idKaRu); String jabatanAtasan1, String atasan2, String nipPnsAtasan2, String jabatanAtasan2, Integer idKaRu);

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

@ -354,19 +354,22 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
if (ji.equals("Kuantitas")) { if (ji.equals("Kuantitas")) {
totAllPersen += hasil; totAllPersen += hasil;
jenisIndikator.put("persenCapaian", (100.0 / 40.0) * hasil); jenisIndikator.put("persenCapaian", (100.0 / Master.Remunerasi.BOBOT_KUANTITAS) * hasil);
jenisIndikator.put("persenCapaianDibulatkan", jenisIndikator.put("persenCapaianDibulatkan",
new BigDecimal(Double.valueOf((100.0 / 40.0) * hasil)).setScale(2, RoundingMode.HALF_UP)); new BigDecimal(Double.valueOf((100.0 / Master.Remunerasi.BOBOT_KUANTITAS) * hasil)).setScale(2,
RoundingMode.HALF_UP));
} else if (ji.equals("Kualitas")) { } else if (ji.equals("Kualitas")) {
totAllPersen += hasil; totAllPersen += hasil;
jenisIndikator.put("persenCapaian", (100.0 / 30.0) * hasil); jenisIndikator.put("persenCapaian", (100.0 / Master.Remunerasi.BOBOT_KUALITAS) * hasil);
jenisIndikator.put("persenCapaianDibulatkan", jenisIndikator.put("persenCapaianDibulatkan",
new BigDecimal(Double.valueOf((100.0 / 30.0) * hasil)).setScale(2, RoundingMode.HALF_UP)); new BigDecimal(Double.valueOf((100.0 / Master.Remunerasi.BOBOT_KUALITAS) * hasil)).setScale(2,
RoundingMode.HALF_UP));
} else if (ji.equals("Perilaku")) { } else if (ji.equals("Perilaku")) {
totAllPersen += hasil; totAllPersen += hasil;
jenisIndikator.put("persenCapaian", (100.0 / 30.0) * hasil); jenisIndikator.put("persenCapaian", (100.0 / Master.Remunerasi.BOBOT_PERILAKU) * hasil);
jenisIndikator.put("persenCapaianDibulatkan", jenisIndikator.put("persenCapaianDibulatkan",
new BigDecimal(Double.valueOf((100.0 / 30.0) * hasil)).setScale(2, RoundingMode.HALF_UP)); new BigDecimal(Double.valueOf((100.0 / Master.Remunerasi.BOBOT_PERILAKU) * hasil)).setScale(2,
RoundingMode.HALF_UP));
} }
jenisIndikator.put("data", data); jenisIndikator.put("data", data);
@ -374,10 +377,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
} }
result.put("listJenisIndikator", listJenisIndikator); result.put("listJenisIndikator", listJenisIndikator);
result.put("rupiahCapaian", totAllPersen / 100 * nilaiJabatan * 3 * pir); result.put("rupiahCapaian", totAllPersen / 100.0 * nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir);
result.put("rupiahCapaianFormat", kursINA.format(totAllPersen / 100 * nilaiJabatan * 3 * pir).toString()); result.put("rupiahCapaianFormat",
result.put("rupiahTarget", nilaiJabatan * 3 * pir); kursINA.format(totAllPersen / 100.0 * nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir).toString());
result.put("rupiahTargetFormat", kursINA.format(nilaiJabatan * 3 * pir).toString()); result.put("rupiahTarget", nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir);
result.put("rupiahTargetFormat", kursINA.format(nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir).toString());
result.put("persenCapaian", totAllPersen); result.put("persenCapaian", totAllPersen);
result.put("persenCapaianDibulatkan", result.put("persenCapaianDibulatkan",
new BigDecimal(Double.valueOf(totAllPersen)).setScale(2, RoundingMode.HALF_UP)); new BigDecimal(Double.valueOf(totAllPersen)).setScale(2, RoundingMode.HALF_UP));

5
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -2057,7 +2057,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
@Override @Override
public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idUnitKerja, public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
Integer idAtasan1, Integer idAtasan2, Integer idKaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2) { Integer idAtasan1, Integer idAtasan2, Integer idKaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2,
String atasanDireksi) {
Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> result = new HashMap<String, Object>();
// PegawaiHistoriRekapIndex pegawaiHistoriRekapIndex= // PegawaiHistoriRekapIndex pegawaiHistoriRekapIndex=
// pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndex(noRecPlanning); // pegawaiHistoriRekapIndexDao.getPegawaiHistoriRekapIndex(noRecPlanning);
@ -2082,6 +2083,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
if (CommonUtil.isNullOrEmpty(atasan1.get("nipPns"))) { if (CommonUtil.isNullOrEmpty(atasan1.get("nipPns"))) {
result.put("nipAtasan1", atasan1.get("nip")); result.put("nipAtasan1", atasan1.get("nip"));
} }
} else if (CommonUtil.isNotNullOrEmpty(atasanDireksi)) {
result.put("namaAtasan1", atasanDireksi);
} }
if (CommonUtil.isNotNullOrEmpty(atasan2)) { if (CommonUtil.isNotNullOrEmpty(atasan2)) {
result.put("namaAtasan2", atasan2.get("nama")); result.put("namaAtasan2", atasan2.get("nama"));

20
jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
View File

@ -6553,11 +6553,12 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
@RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu, @RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu,
@RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2, @RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2,
@RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1, @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1,
@RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2) { @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2,
@RequestParam(value = "atasanDireksi", required = false) String atasanDireksi) {
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
Map<String, Object> data = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja, Map<String, Object> data = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja,
idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2, atasanDireksi);
result.add(data); result.add(data);
m.addObject("dataSource", result); m.addObject("dataSource", result);
m.addObject("format", "pdf"); m.addObject("format", "pdf");
@ -6578,11 +6579,12 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
@RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu, @RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu,
@RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2, @RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2,
@RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1, @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1,
@RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2) { @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2,
@RequestParam(value = "atasanDireksi", required = false) String atasanDireksi) {
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
Map<String, Object> data = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja, Map<String, Object> data = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja,
idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2, atasanDireksi);
result.add(data); result.add(data);
m.addObject("dataSource", result); m.addObject("dataSource", result);
m.addObject("format", "pdf"); m.addObject("format", "pdf");
@ -6603,12 +6605,13 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
@RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu, @RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu,
@RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2, @RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2,
@RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1, @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1,
@RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2) { @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2,
@RequestParam(value = "atasanDireksi", required = false) String atasanDireksi) {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
Map<String, Object> page1 = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja, Map<String, Object> page1 = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja,
idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2, atasanDireksi);
Map<String, Object> page2 = reportService.findDataCetakLuarNegeri(noRecPlanning); Map<String, Object> page2 = reportService.findDataCetakLuarNegeri(noRecPlanning);
data.putAll(page1); data.putAll(page1);
data.putAll(page2); data.putAll(page2);
@ -6634,12 +6637,13 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
@RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu, @RequestParam(value = "idKaRu", required = false, defaultValue = "0") Integer idKaRu,
@RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2, @RequestParam(value = "idAtasan2", required = false, defaultValue = "0") Integer idAtasan2,
@RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1, @RequestParam(value = "idJabatanAtasan1", required = false, defaultValue = "0") Integer idJabatanAtasan1,
@RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2) { @RequestParam(value = "idJabatanAtasan2", required = false, defaultValue = "0") Integer idJabatanAtasan2,
@RequestParam(value = "atasanDireksi", required = false) String atasanDireksi) {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
Map<String, Object> page1 = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja, Map<String, Object> page1 = reportService.generateLapPermohonanCuti(noRecPlanning, idJabatan, idUnitKerja,
idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2); idAtasan1, idAtasan2, idKaRu, idJabatanAtasan1, idJabatanAtasan2, atasanDireksi);
Map<String, Object> page2 = reportService.findDataCetakLuarNegeri(noRecPlanning); Map<String, Object> page2 = reportService.findDataCetakLuarNegeri(noRecPlanning);
data.putAll(page1); data.putAll(page1);
data.putAll(page2); data.putAll(page2);