From 447862e3c3cf4b487692a327e6ebabf24450aeca Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 7 Sep 2023 15:18:00 +0700 Subject: [PATCH] Clean code Persiapan penyesuaian hak akses pegawai sdm --- .../medifirst2000/constants/Master.java | 246 +-- .../medifirst2000/dao/PegawaiDao.java | 104 +- .../PermohonanStatusPegawaiService.java | 120 +- .../impl/LogbookKinerjaServiceImpl.java | 710 ++++---- .../service/impl/PegawaiServiceImpl.java | 99 +- .../impl/PelayananPasienServiceImpl.java | 2 +- .../impl/PermohonanStatusPegawaiImpl.java | 845 ++-------- .../controller/PegawaiController.java | 189 +-- .../controller/SdmController.java | 1180 ++++++-------- .../controller/SdmController.java | 1451 +++++------------ 10 files changed, 1570 insertions(+), 3376 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index d81bbb35..7f8c717f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -1,45 +1,26 @@ package com.jasamedika.medifirst2000.constants; -public class Master { - public static final short KODE_PROFILE = 0; +public final class Master { public static final int EMPTY_DATA = 0; - - public static final boolean STATUS_ENABLE_FALSE = false; - public static final boolean STATUS_ENABLE_TRUE = true; - - public static final Double MENIT_KERJA_HARIAN = 7.5 * 60.0; - public static final Double MENIT_KERJA_RAMADHAN = 6.0 * 60.0; - - public static final String TIDAK_ADA_PERUBAHAN_DATA = "Tidak Ada Perubahan Data!"; - - public static final String AKOMODASI = "akomodasi"; - public static final String MATERAI = "materai"; - public static final String KARCIS = "karcis"; - public static final String KONSUL = "konsul"; - public static final String VISIT = "visit"; - - public static final String[] KONSUL_VISIT = { "konsul", "visit" }; - public static final String[] MATERAI_ADMINISTRASI = { "materai", "administrasi" }; - - public static final String[] JENIS_INDIKATOR = { "Kuantitas", "Kualitas", "Perilaku" }; - public static final String[] IP_HEADER_CANDIDATES = { "X-Forwarded-For", "Proxy-Client-IP", "WL-Proxy-Client-IP", "HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED", "HTTP_X_CLUSTER_CLIENT_IP", "HTTP_CLIENT_IP", "HTTP_FORWARDED_FOR", "HTTP_FORWARDED", "HTTP_VIA", "REMOTE_ADDR" }; - - public static final class CutiBersama { - public static final Integer HK_02_03_XXI_2_698_2019_5 = 24; - } + public static final String[] JENIS_INDIKATOR = { "Kuantitas", "Kualitas", "Perilaku" }; + public static final short KODE_PROFILE = 0; + public static final String KONSUL = "konsul"; + public static final String[] KONSUL_VISIT = { "konsul", "visit" }; + public static final Double MENIT_KERJA_HARIAN = 7.5 * 60.0; + public static final Double MENIT_KERJA_RAMADHAN = 6.0 * 60.0; + public static final boolean STATUS_ENABLE_FALSE = false; + public static final boolean STATUS_ENABLE_TRUE = true; + public static final String TIDAK_ADA_PERUBAHAN_DATA = "Tidak Ada Perubahan Data!"; + public static final String VISIT = "visit"; public static final class Departemen { - public static final Integer[] ALL_DEPARTEMEN_MEDIS = { 3, 16, 18, 24, 25, 26, 27, 28, 35 }; + public static final Integer BEDAH_SENTRAL = 25; public static final Integer[] GRUP_RAWAT_INAP = { 16, 25, 26, 35 }; public static final Integer[] GRUP_RAWAT_JALAN_ALL = { 3, 18, 24, 27, 28 }; - public static final Integer[] GRUP_RAWAT_JALAN_PENUNJANG = { 3, 27, 28 }; public static final Integer[] GRUP_RAWAT_JALAN_UTAMA = { 18, 24 }; - public static final Integer[] KARCIS = { 18, 24, 28 }; - - public static final Integer BEDAH_SENTRAL = 25; public static final Integer IGD = 24; public static final Integer LABORATORIUM = 3; public static final Integer RADIOLOGI = 27; @@ -49,23 +30,9 @@ public class Master { } public static final class DetailJenisProduk { - public static final Integer[] ADMINISTRASI_PATOLOGI_KLINIK_EXCEPTION = { 6, 15, 97, 99, 118, 119, 120, 121, 122, - 123, 124, 125, 126, 133, 158, 479, 496, 519, 520, 521, 522, 530, 1335, 1336, 1337, 1398, 1409, 1465, - 27666 }; - public static final Integer[] MEDIS_UTAMA = { 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 57, 59, 60, 61, 62, 63, 64, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 408, 409, 410, - 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, - 432, 433, 434, 435, 436, 437, 438, 479, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, - 494, 495, 496, 501, 503, 504, 505, 506, 508, 509, 510, 511, 512, 527, 528, 1418, 1419, 1448, 1449, 1459, - 1460 }; public static final Integer[] PENUNJANG_PATOLOGI_ANATOMI = { 6, 7, 8, 9, 15, 133, 519, 520, 521, 522 }; public static final Integer[] PENUNJANG_PATOLOGI_KLINIK = { 120, 121, 122, 123, 124, 125, 126, 530, 1335, 1336, 1337, 1419, 1420, 1421, 1422 }; - public static final Integer[] PENUNJANG_RADIOLOGI = { 65, 66, 418, 498, 499, 500, 501, 502, 503, 504, 505, 1293, - 1410, 1411, 1412, 1413, 1414, 1415, 1416, 1417, 1423, 1424, 1425, 1426 }; - public static final Integer[] LABORATORIUM = { 6, 7, 8, 9, 15, 53, 54, 55, 56, 118, 119, 120, 121, 122, 123, - 124, 125, 133, 519, 521, 1419, 1420, 1421, 1422 }; } public static final class FeeForService { @@ -88,9 +55,7 @@ public class Master { public static final Integer KETEPATAN_KEHADIRAN = 357; public static final Integer PEMENUHAN_HARI_KERJA = 351; public static final Integer PEMENUHAN_JAM_KERJA = 350; - public static final Integer PELAYANAN_FARMAKOLOGI = 758; public static final Integer PELAYANAN_MEDIS_JAM_KERJA = 466; - public static final Integer PELAYANAN_MEDIS_LUAR_JAM_KERJA = 522; public static final Integer PELAYANAN_NAKES = 678; public static final Integer PELAYANAN_PERAWAT = 712; } @@ -100,6 +65,7 @@ public class Master { } public static final class IndikatorKinerjaJamKerja { + public static final Integer[] INDIKATOR_PELAYANAN_MEDIS = { 1, 2, 3, 4, 5, 6, 7, 8 }; public static final Integer KONSUL_EKS = 1; public static final Integer KONSUL_GADAR = 2; public static final Integer KONSUL_REG = 3; @@ -108,11 +74,10 @@ public class Master { public static final Integer TINDAKAN_OPS = 6; public static final Integer TINDAKAN_REG = 7; public static final Integer VISITE = 8; - - public static final Integer[] INDIKATOR_PELAYANAN_MEDIS = { 1, 2, 3, 4, 5, 6, 7, 8 }; } public static final class IndikatorKinerjaLuarJamKerja { + public static final Integer[] INDIKATOR_PELAYANAN_MEDIS = { 9, 10, 11, 12, 13, 14, 15, 16 }; public static final Integer KONSUL_EKS = 9; public static final Integer KONSUL_GADAR = 10; public static final Integer KONSUL_REG = 11; @@ -121,24 +86,21 @@ public class Master { public static final Integer TINDAKAN_OPS = 14; public static final Integer TINDAKAN_REG = 15; public static final Integer VISITE = 16; - - public static final Integer[] INDIKATOR_PELAYANAN_MEDIS = { 9, 10, 11, 12, 13, 14, 15, 16 }; } public static final class Jabatan { + public static final Integer[] DIRUT = { 137, 896, 1172 }; public static final int DIRUT_STRUKTURAL = 896; public static final int DIRUT_INTERNAL = 137; public static final int DIRUT_PLH = 1172; public static final int LEVEL_DIRUT = 1; public static final int LEVEL_DIREKTUR = 2; - - public static final Integer[] DIRUT = { 137, 896, 1172 }; public static final Integer[] LEVEL_KEPALA = { 3, 4 }; } public static final class JenisKomponenGaji { - public static final Integer PENERIMAAN = 1; public static final Integer PEMOTONGAN = 2; + public static final Integer PENERIMAAN = 1; } public static final class JenisPegawai { @@ -147,57 +109,44 @@ public class Master { public static final class JenisPetugasPelaksana { public static final Integer ASISTEN_SPESIALIS = 13; - public static final Integer DOKTER_PEMERIKSA = 4; public static final Integer DOKTER_ANASTESI = 6; - public static final Integer PETUGAS_PELAKSANA = 2; - - public static final Integer[] MEDIS_UTAMA = { 4, 6, 13 }; public static final Integer[] DOKTER_ANASTESI_OR_ASISTEN_SPESIALIS = { 6, 13 }; + public static final Integer DOKTER_PEMERIKSA = 4; + public static final Integer PETUGAS_PELAKSANA = 2; } public static final class JenisProduk { - public static final Integer ALAT_CANGGIH = 27666; // pemakaian_alat public static final Integer LAB_KLINIK = 36; // laboratorium_klinik - public static final Integer OBAT_ALKES = 97; // barang_farmasi - public static final Integer[] NONKONSULTASI = { 116, 277 }; // reagensia,barang_umum public static final Integer[] NONLOGBOOK = { 97, 277, 283 }; // barang_farmasi,barang_umum,vaksin public static final Integer[] NONTINDAKAN = { 97, 283 }; // barang_farmasi,vaksin + public static final Integer OBAT_ALKES = 97; // barang_farmasi } public static final class KategoryPegawai { + public static final Integer BLU_PKWT = 2; public static final Integer[] DOKTER_LUAR = { 12, 13, 19 }; + public static final Integer DOKTER_TAMU = 19; + public static final Integer MITRA = 16; public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,_mitra public static final Integer[] PARUH_WAKTU = { 12, 19 }; + public static final Integer PESERTA_DIDIK = 17; + public static final Integer PNS = 1; public static final Integer[] PURNA_WAKTU = { 1, 2, 10, 14, 21 }; public static final Integer[] REMUN = { 1, 10, 14, 21 }; - - public static final Integer BLU_PKWT = 2; - public static final Integer DOKTER_TAMU = 19; - public static final Integer PNS = 1; - public static final Integer MITRA = 16; - public static final Integer PESERTA_DIDIK = 17; } public static final class KedudukanPegawai { public static final Integer[] INACTIVE_LOGIN = { 3, 4, 5, 6, 24, 25, 26, 28, 29 }; // nonaktif,_berhenti,_keluar,_pensiun,_pindah,_hukuman,_meninggal,_suspend - public static final Integer[] NONSDM = { 3, 4, 5, 24, 25, 28 }; // pensiun,_meninggal,_pindah,_nonaktif,_berhenti - public static final Integer NONAKTIF = 24; + public static final Integer[] NONSDM = { 3, 4, 5, 24, 25, 28 }; // pensiun,_meninggal,_pindah,_nonaktif,_berhenti } public static final class Kelas { public static final Integer[] KELAS_DUA_TIGA_NONKELAS = { 1, 2, 6 }; + public static final Integer KELAS_SATU = 3; public static final Integer[] KELAS_SATU_VIP = { 3, 5, 8, 21 }; public static final Integer[] REF_KELAS_KAMAR = { 1, 2, 3, 5, 6, 8 }; - - public static final Integer KELAS_DUA = 2; - public static final Integer KELAS_SATU = 3; - public static final Integer KELAS_TIGA = 1; - public static final Integer KELAS_VIP_A = 5; - public static final Integer KELAS_VIP_B = 8; - public static final Integer KELAS_VIP = 21; - public static final Integer NONKELAS = 6; } public static final class KelompokJabatan { @@ -206,50 +155,47 @@ public class Master { } public static final class KelompokPasien { - public static final Integer ASURANSI_LAIN = 3; public static final Integer BPJS = 2; + public static final Integer[] KELOMPOK_BPJS = { 2, 4, 8, 9 }; public static final Integer KEMENKES = 8; public static final Integer JAMKESDA = 9; public static final Integer UMUM = 1; - - public static final Integer[] JAMINAN = { 2, 3, 5, 6 }; - public static final Integer[] KELOMPOK_BPJS = { 2, 4, 8, 9 }; } public static final class KelompokShift { + public static final Integer[] ALL_NONSHIFT = { 1, 2 }; public static final Integer NONSHIFT = 1; public static final Integer NONSHIFT_PLUS = 2; public static final Integer SHIFT_DUA = 4; - - public static final Integer[] ALL_NONSHIFT = { 1, 2 }; } public static final class KelompokUser { public static final Integer DEFAULT = 0; + public static final Integer TATA_REKENING = 52; } public static final class KomponenGaji { - public static final Integer GAJI = 1; - public static final Integer REMUNERASI_KINERJA = 2; - public static final Integer REMUNERASI_TAMBAHAN_MANAJERIAL = 3; - public static final Integer FEE_FOR_SERVICE = 4; - public static final Integer FEE_FOR_ONSITE = 5; - public static final Integer UANG_MAKAN = 6; - public static final Integer UANG_LEMBUR = 7; - public static final Integer PPH_GAJI = 8; - public static final Integer PPH_REMUNERASI = 9; - public static final Integer PPH_FEE_FOR_SERVICE = 10; - public static final Integer PPH_FEE_FOR_ONSITE = 11; - public static final Integer PPH_UANG_MAKAN = 12; - public static final Integer PPH_UANG_LEMBUR = 13; - public static final Integer IURAN_WAJIB_KOPERASI = 14; - public static final Integer PINJAMAN_KOPERASI = 15; public static final Integer BIAYA_OBAT_ALKES = 16; public static final Integer BIAYA_RAWAT_INAP = 17; public static final Integer BIAYA_RAWAT_JALAN = 18; - public static final Integer POTONGAN_TOKO_KOPERASI = 19; + public static final Integer FEE_FOR_ONSITE = 5; + public static final Integer FEE_FOR_SERVICE = 4; + public static final Integer GAJI = 1; + public static final Integer IURAN_WAJIB_KOPERASI = 14; + public static final Integer PINJAMAN_KOPERASI = 15; public static final Integer POTONGAN_BPJSK = 20; public static final Integer POTONGAN_BPJSTK = 21; + public static final Integer POTONGAN_TOKO_KOPERASI = 19; + public static final Integer PPH_FEE_FOR_ONSITE = 11; + public static final Integer PPH_FEE_FOR_SERVICE = 10; + public static final Integer PPH_GAJI = 8; + public static final Integer PPH_REMUNERASI = 9; + public static final Integer PPH_UANG_MAKAN = 12; + public static final Integer PPH_UANG_LEMBUR = 13; + public static final Integer REMUNERASI_KINERJA = 2; + public static final Integer REMUNERASI_TAMBAHAN_MANAJERIAL = 3; + public static final Integer UANG_LEMBUR = 7; + public static final Integer UANG_MAKAN = 6; public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22; public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23; } @@ -258,8 +204,6 @@ public class Master { public static final Integer JASA_ASISTEN_SPESIALIS = 22; public static final Integer JASA_DOKTER = 35; public static final Integer JASA_DOKTER_ANASTESI = 21; - public static final Integer JASA_UMUM = 30; - public static final Integer[] JASA_MEDIS = { 21, 22, 35 }; public static final Integer[] JASA_PARAMEDIS = { 25, 26, 27 }; public static final Integer[] JASA_SARANA = { 6, 38 }; @@ -273,17 +217,7 @@ public class Master { public static final class LogbookDokter { public static final boolean IS_TARIF_SATU_HARGA = true; - - /** - * Komponen operator dari tarif konsultasi dokter spesialis - */ public static final Double KOMPONEN_DASAR = 120000.0; - - public static final Double PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS = 15.0; - public static final Double PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA = 30.0; - public static final Double PERSENTASE_TINDAKAN_DOKTER_ANASTESI = 15.0; - public static final Double PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI = 30.0; - public static final Double TARIF_REMUNERASI = 45000.0; } public static final class Logging { @@ -293,8 +227,6 @@ public class Master { public static final class LoginUser { public static final int GENERATED_NEW_LOGIN = 1; public static final int GENERATED_USED_LOGIN = 0; - - public static final Integer TATA_REKENING = 52; } public static final class MonitoringAbsensi { @@ -303,15 +235,14 @@ public class Master { } public static final class Pegawai { - public static final Integer[] LOGIN_ADMIN = { 320263, 320264 }; - public static final Integer[] ADMINISTRATOR = { 0, 320272 }; - public static final Integer[] RESTRICTED_EMPLOYEE = { 0, 89093, 320263, 320264, 320270, 320271, 320272 }; // pegawai_injek-an + public static final Integer[] LOGIN_ADMIN = { 320263, 320264 }; + public static final Integer[] RESTRICTED_EMPLOYEE = { 0, 89093, 320263, 320264, 320270, 320271, 320272 }; // pegawai_injected } public static final class PenangguhanCuti { - public static final String[] NONSHIFT_SK = { "Senin", "Selasa", "Rabu", "Kamis" }; public static final String[] NONSHIFT_J = { "Jumat" }; + public static final String[] NONSHIFT_SK = { "Senin", "Selasa", "Rabu", "Kamis" }; } public static final class PengajuanCuti { @@ -323,23 +254,10 @@ public class Master { public static final String DEFAULT_ACC_CODE = "x"; public static final String SMART_LOC_CODE = "99999"; public static final Integer SMART_REMOTE_NO = 99; - public static final String VPN = "103.144.126.78"; - - public static final String[] INET_PROVIDERS = { "103.116.203.91", "103.116.203.92", "103.116.203.93", - "43.225.67.209" }; } public static final class Produk { public static final int KARCIS = 395; - public static final Integer KONSULTASI_DOKTER_JAGA = 400; - public static final Integer PAKET_BAYI_TABUNG = 1002129402; - - public static final Integer[] DOKTER_UMUM_IGD = { 783, 401333, 402413, 402414, 402449, 402484 }; - public static final Integer[] KONSULTASI_EKSEKUTIF = { 401092, 401093 }; - public static final Integer[] MONITORING_INTERVENSI = { 10666, 4037948 }; - public static final Integer[] PENUNJANG_BUKAN_ANASTESI = { 13409, 15208, 19325, 19346, 19371, 19405, 19406, - 19535, 19599, 402009, 10009835, 10012269, 1002117344, 1002117938, 1002117963, 1002117964, 1002117965, - 1002117966 }; } public static final class Profesi { @@ -354,56 +272,31 @@ public class Master { public static final Integer[] REKAM_MEDIK = { 15 }; } - public static final class Rekanan { - public static final Integer JAMINAN_KEMENKES = 581398; - } - public static final class Remunerasi { - 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 IKU = 1.0; - + public static final Integer[] JENIS_INDIKATOR = { 1, 2, 3 }; public static final Double PERSEN_P1 = 0.3; public static final Double PERSEN_P2 = 0.7; - - public static final Double PERSEN_SKOR_LUAR_JAM_KERJA = 1.15; - public static final Double PERSEN_SKOR_ASISTEN_SPESIALIS = 0.3; public static final Double PERSEN_SKOR_EKSEKUTIF = 1.15; + public static final Double PERSEN_SKOR_LUAR_JAM_KERJA = 1.15; } public static final class Ruangan { - public static final Integer[] ICU_NICU = { 328, 75, 707, 708 }; public static final Integer[] GENETIKA = { 277, 563, 587 }; - public static final Integer[] NONRANAP = { 45, 75, 76, 328, 463, 464 }; - public static final Integer[] NONIKI_NONFFS = { 535 }; - public static final Integer[] PENUNJANG_MURNI = { 39, 276 }; - public static final Integer[] PERISTI = { 45, 75, 76, 463, 464 }; - public static final Integer[] TANJUNG = { 72, 551 }; - - public static final Integer ICU_COVID = 707; - public static final Integer ICU_PICU = 328; + public static final Integer[] ICU_NICU = { 328, 75, 707, 708 }; + public static final int KLINIK_FALSE_EMERGENCY = 309; public static final Integer KLINIK_GIGI_KARYAWAN = 702; public static final Integer KLINIK_KARYAWAN = 70; - public static final Integer KLINIK_TERPADU_DIALISIS = 535; - public static final Integer MICU = 464; - public static final Integer NICU = 75; - public static final Integer NICU_COVID = 708; - - public static final int KLINIK_FALSE_EMERGENCY = 309; public static final int LABORATORIUM_PATOLOGI_ANATOMI = 39; public static final int LABORATORIUM_PATOLOGI_KLINIK = 276; - - /* - * Laboratorium Sitogenitika dan Genetika Molekular - */ - public static final int LABORATORIUM_SGM = 587; - + public static final Integer NICU = 75; + public static final Integer NICU_COVID = 708; + public static final Integer[] NONRANAP = { 45, 75, 76, 328, 463, 464 }; public static final int OK = 44; - public static final int POLI_THT = 6; public static final int POLI_MATA = 5; + public static final int POLI_THT = 6; public static final int RADIOLOGI = 35; } @@ -412,21 +305,19 @@ public class Master { } public static final class ShiftKerja { + public static final float FACTOR_RATE_NONSHIFT = 8; + public static final Integer[] HOLIDAY = { 8, 14, 15, 40 }; public static final Integer[] HOLIDAY_INCLUDED = { 7, 13, 67, 69, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83 }; - public static final Integer[] HOLIDAY = { 8, 14, 15, 40 }; + public static final Integer NONSHIFT_J = 19; + public static final Integer NONSHIFT_SK = 18; + public static final Integer NONSHIFT_PLUS_J = 85; + public static final Integer NONSHIFT_PLUS_SK = 84; + public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x"; public static final Integer[] PSM = { 31, 47, 106 }; + public static final Integer RESET = 0; public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115 }; - - public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x"; - public static final float FACTOR_RATE_NONSHIFT = 8; - - public static final Integer NONSHIFT_SK = 18; - public static final Integer NONSHIFT_J = 19; - public static final Integer NONSHIFT_PLUS_SK = 84; - public static final Integer NONSHIFT_PLUS_J = 85; - public static final Integer RESET = 0; } public static final class StatusPegawai { @@ -436,7 +327,6 @@ public class Master { public static final Integer CUTI_SAKIT = 29; public static final Integer CUTI_TAHUNAN = 1; public static final Integer IZIN = 27; - public static final Integer[] KETIDAKHADIRAN = { 1, 6, 24, 25, 26, 27, 28, 29 }; public static final Integer[] NONPERIODIK_PENGAJUAN_KETIDAKHADIRAN = { 1, 6, 26, 27, 28 }; public static final Integer[] PERIODIK_PENGAJUAN_KETIDAKHADIRAN = { 6, 24, 25, 29 }; @@ -476,12 +366,11 @@ public class Master { public static final Integer[] KSM = { 58, 59, 60, 61, 62, 63, 82 }; public static final Integer[] DOKTER = { 30, 31, 32, 33, 34, 35, 36, 38, 71 }; public static final Integer[] NAKES_LAIN = { 35, 36, 37, 38, 40, 41, 46, 57, 71 }; - public static final Integer[] PERAWAT = { 30, 31, 32, 33, 71 }; - public static final Integer BAG_SDM = 24; public static final Integer BID_WAT = 21; public static final Integer BID_JANG = 83; public static final Integer DIREKSI = 65; + public static final Integer IK3KL = 46; public static final Integer INS_FARMASI = 37; public static final Integer INS_GIZI = 41; public static final Integer INS_LAB_TERPADU = 35; @@ -489,13 +378,14 @@ public class Master { public static final Integer INS_RAWAT_JALAN = 71; public static final Integer INS_REHAB_MEDIK = 38; public static final Integer INS_REKAM_MEDIK = 57; - public static final Integer IK3KL = 46; public static final Integer IP3RS = 40; public static final Integer KSM_LAIN = 61; - public static final Integer KSM_UMUM = 62; } public static final class User { public static final Integer MOBILE_JKN = 3; } + + private Master() { + } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java index 3a384ced..9b12ee52 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java @@ -3,11 +3,10 @@ package com.jasamedika.medifirst2000.dao; import com.jasamedika.medifirst2000.entities.Jabatan; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.vo.PegawaiVO; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import java.util.Date; import java.util.List; @@ -15,11 +14,10 @@ import java.util.Map; /** * Repository class for Pegawai - * + * * @author Askur */ -@Repository("PegawaiDao") -public interface PegawaiDao extends PagingAndSortingRepository, JpaSpecificationExecutor { +public interface PegawaiDao extends JpaRepository, JpaSpecificationExecutor { @Query("select new map (pegawai.id as id, pegawai.namaLengkap as namaLengkap) " + "from Pegawai pegawai where pegawai.id = :pegawaiId and pegawai.statusEnabled is true") @@ -93,9 +91,6 @@ public interface PegawaiDao extends PagingAndSortingRepository List getAllDokterByRuanganAndTanggal(@Param("kodeRuangan") String kodeRuangan, @Param("tanggal") Date tanggal); - @Query("select model from Pegawai model where model.namaLengkap=:nama") - List findPasienByNama(@Param("nama") String nama); - @Query("select model from Pegawai model where model.statusEnabled is true and model.id=:nik") List findPasienByNik(@Param("nik") String nik); @@ -211,17 +206,6 @@ public interface PegawaiDao extends PagingAndSortingRepository @Query("select model from Pegawai model where model.statusEnabled is true and model.statusPegawai.kdStatusPegawai=2") List findAllPegawai(); - @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id) " - + "from SettingDataFixed s,JenisPegawai j,Pegawai p where j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId and j.id= (Select cast(s.nilaiField as int) " - + "from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') and p.qPegawai=:kdPegawai group by p.id") - Pegawai findByKdPegawaiDokter(@Param("kdPegawai") short kdPegawai); - - @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai(p.namaLengkap, p.namaPanggilan, p.nikIntern, p.nipPns, p.noIdentitas,p.npwp,p.id,p.qPegawai) " - + "from SettingDataFixed s,JenisPegawai j,Pegawai p where j.kdJenisPegawai=s.nilaiField and j.id=p.jenisPegawaiId and j.id= (Select cast(s.nilaiField as int) " - + "from SettingDataFixed s where s.namaField='KdJenisPegawaiDokter') and p.statusEnabled is true and p.statusPegawai.kdStatusPegawai=2 group by p.id " - + "order by p.namaLengkap") - List getDokters(); - @Query("select p from Pegawai p where p.statusEnabled is true and p.jabatanFungsionalId=:jabatanFungsionalId") List findByJabatanFungsional(@Param("jabatanFungsionalId") Integer jabatanFungsionalId); @@ -277,11 +261,6 @@ public interface PegawaiDao extends PagingAndSortingRepository @Query("select p.jabatanStruktural from Pegawai p where p.id=:id") Jabatan findJabatanByIdPegawai(@Param("id") Integer id); - @Query("select peg from MapPegawaiJabatanToUnitKerja mappeg left join mappeg.pegawai peg where mappeg.pegawaiId=:idPegawai " - + "and mappeg.jabatanId=:idJabatan and mappeg.statusEnabled is true") - Pegawai findPegawaiByIdJabatanInternal(@Param("idPegawai") Integer idPegawai, - @Param("idJabatan") Integer idJabatan); - @Query("select mapPegawai.jabatan from MapPegawaiJabatanToUnitKerja mapPegawai left join mapPegawai.pegawai p " + "where mapPegawai.isPrimary is true and mapPegawai.statusEnabled is true and p.id=:id") Jabatan findJabatanInternalByIdPegawai(@Param("id") Integer id); @@ -501,34 +480,11 @@ public interface PegawaiDao extends PagingAndSortingRepository @Param("listKategoryPegawaiId") List listKategoryPegawaiId, @Param("listKedudukan") List listKedudukan); - @Query("select new Map(p.nipPns as nip, p.namaLengkap as namaPegawai , p.tglLahir as tglLahir, p.tempatLahir as tempatLahir, " - + "j.kdJabatan as idJabatan,j.namaJabatan as namaJabatan, " - + "g.id as idGolongan,g.golonganPegawai as namaGolongan , " - + " sk.statusPerkawinan as idStatusKawin, sk.statusPerkawinan as statusPerkawinan, " - + "a.agama as namaAgama, a.kdAgama as idAgama , " - + " s.kdSatuanKerja as idSatuanKerja,s.satuanKerja as satuanKerja , " - + " js.kdJabatan as idJabatanStruktural,js.namaJabatan as namaJabatanStruktural, " - + " jf.kdJabatan as idJabatanFungsional,jf.namaJabatan as namaJabatanFungsional " - + ") from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p " - + "left join mapPegawai.jabatan j " + "left join p.golonganPegawai g " + "left join p.statusKawin sk " - + "left join p.agama a " + "left join p.satuanKerja s " + "left join p.jabatanStruktural js " - + "left join p.jabatanFungsional jf " + "where mapPegawai.isPrimary is true " - + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " - + "and p.namaLengkap like :namaPegawai " + "order by p.namaLengkap") - List> findAllPegawaiNoPagingSearch(@Param("namaPegawai") String namaPegawai); - - @Query("select p.id from Pegawai p where p.statusEnabled is true") - List findAllIdPegawai(); - @Query("select p.id from Pegawai p " + "left join p.statusPegawai statusPegawai " + "left join p.kategoryPegawai kategori " + "where p.statusEnabled is true and statusPegawai.id = 2 " + "and kategori.id != 11 ") List findPegawaiStatusAktifAndKaryawan(); - @Query("select kategori.id " + "from Pegawai p " + "left join p.statusPegawai statusPegawai " - + "left join p.kategoryPegawai kategori " + "where p.statusEnabled is true " + "and p.id = :idPegawai") - Integer getStatusKategoryPegawai(@Param("idPegawai") Integer idPegawai); - @Query("select p from Pegawai p " + "left join p.statusPegawai statusPegawai " + "left join p.shiftKerja shiftKerja " + "where p.statusEnabled is true " + "and to_char(p.tglMasuk,'yyyy-MM-dd') <= :tahun " + "and shiftKerja.id= :idKelompokShift ") @@ -592,20 +548,6 @@ public interface PegawaiDao extends PagingAndSortingRepository @Query(strQryJabatanCetak + cdtJabatanCetak) Map findPegawaiById(@Param("pegawaiId") Integer idPegawai, @Param("jabatanId") Integer idJabatan); - // GET ALL DOKTER BY RUANGAN KERJA - @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,m.jabatan.id as idJabatanInternal, m.jabatan.namaJabatan as namaJabatan) " - + "from MapPegawaiJabatanToUnitKerja m " + "left join m.pegawai p " + "where p.statusEnabled is true " - + "and m.isPrimary is true " + "and m.statusEnabled is true " + "and p.jenisPegawai.id=1 " - + "and p.ruangan.id=:ruangan") - List> findDokterByRuanganKerja(@Param("ruangan") Integer ruangan); - - // GET ALL PEGAWAI BY RUANGAN KERJA EXCEPT DOKTER - @Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,mapPegawai.jabatan.id as idJabatanInternal, mapPegawai.jabatan.namaJabatan as namaJabatan) " - + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p " - + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " - + "and p.statusEnabled is true " + "and p.ruangan.id=:ruangan " + "and p.jenisPegawai.id not in(1)") - List> findPegawaiExceptDokterByRuanganKerja(@Param("ruangan") Integer ruangan); - @Query("select new com.jasamedika.medifirst2000.entities.Pegawai(p.id, p.namaLengkap, p.nipPns) from Pegawai p where p.nipPns=:nipPns") Pegawai findOneByNipPns(@Param("nipPns") String nipPns); @@ -614,12 +556,6 @@ public interface PegawaiDao extends PagingAndSortingRepository + "where p.statusEnabled is true and statuspegawai.id=2") List> findAllPegawais(); - // GET HARI LIBUR - @Query("select new map(model2.tanggal as tanggal, model1.namaExternal as namaHariLibur,model2.namaHari as namaHari) from MapKalenderToHariLibur model1 " - + "right join model1.tanggal model2 where model2.tahunKalender = :tahun and model2.bulanKeDlmTahun= :bulan") - List> findHariLiburPegawaiNonShift(@Param("tahun") Integer tahun, - @Param("bulan") Integer bulan); - @Query("select NEW com.jasamedika.medifirst2000.entities.Pegawai (model.id, model.namaLengkap) " + "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai model " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " @@ -687,20 +623,6 @@ public interface PegawaiDao extends PagingAndSortingRepository + " where pegawai.statusEnabled is true and pegawai.id = :idPegawai") List findIdJabatanManajerialByIdPegawai(@Param("idPegawai") Integer idPegawai); - @Query("select new map ( kelompokJabatan.usiaPensiun as usiaPensiun, " - + " kelompokJabatan.id as idKelompokJabatan ) " + "from Jabatan jabatanFungsional " - + "left join jabatanFungsional.kelompokJabatan kelompokJabatan " - + "where jabatanFungsional.id = :idJabatanFungsional") - Map findIdUsiaPensiunByIdJabatanFungsional( - @Param("idJabatanFungsional") Integer idJabatanFungsional); - - @Query("select pegawai.id " + "from Pegawai pegawai " + "left join pegawai.pendidikan pendidikan " - + "left join pegawai.jabatanFungsional jabatanFungsional " - + "left join jabatanFungsional.kelompokJabatan kelompokJabatan " - + "where pendidikan.id = :idPendidikan and kelompokJabatan.id = :idKelJabatan and pegawai.id = :idPegawai") - Integer findPerawatSarjana(@Param("idPegawai") Integer idPegawai, @Param("idKelJabatan") Integer idKelJabatan, - @Param("idPendidikan") Integer idPendidikan); - @Query("select new map (p.id as id, " + "p.namaLengkap as namaLengkap, " + "p.tglPensiun as tglpensiun, " + "p.tglLahir as tglLahir, " + "p.nipPns as nip, " + "golongan.golonganPegawai as golongan, " + "pendidikan.namaPendidikan as pendidikan," + "subUnitKerja.name as subUnitKerja, " @@ -889,21 +811,12 @@ public interface PegawaiDao extends PagingAndSortingRepository + "and pegawai.id = :idPegawai " + "order by pegawai.nama asc") Map getPegawaiToMonitoringAbsen(@Param("idPegawai") Integer idPegawai); - @Query("select p.id " + "from MapPegawaiJabatanToUnitKerja mappeg " + "inner join mappeg.pegawai p " - + "inner join mappeg.subUnitKerjaPegawai subUnitKerja " + "where mappeg.statusEnabled is true " - + "and p.statusEnabled is true " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true " - + "and p.shiftKerjaId in (1,2) " + "and subUnitKerja.id = :subUnitKerja " + "order by p.id asc") - List getPegawaiNonshiftBySubunitKerja(@Param("subUnitKerja") Integer subUnitKerja); - @Query("select p.id " + "from MapPegawaiJabatanToUnitKerja mappeg " + "inner join mappeg.pegawai p " + "inner join mappeg.subUnitKerjaPegawai subUnitKerja " + "where mappeg.statusEnabled is true " + "and p.statusEnabled is true " + "and mappeg.isPrimary is true " + "and mappeg.statusEnabled is true " + "and p.shiftKerjaId in (1,2) " + "order by p.id asc") List getPegawaiNonshift(); - @Query("select peg.id from Pegawai peg where peg.statusEnabled is true and peg.jenisPegawaiId=1 and peg.ruanganId=:idRuangan") - int[] getDokterByRuanganId(@Param("idRuangan") int idRuangan); - @Query("select distinct pgw.id " + "from MapPegawaiJabatanToUnitKerja mpj " + "inner join mpj.pegawai pgw " + "where mpj.statusEnabled is true " + "and pgw.statusEnabled is true " + "and pgw.jenisPegawaiId = 1 " + "and mpj.subUnitKerjaPegawaiId = :subunitKerjaId") @@ -920,17 +833,6 @@ public interface PegawaiDao extends PagingAndSortingRepository @Query("select pg.shiftKerjaId from Pegawai pg where pg.statusEnabled is true and pg.id = :idPegawai") Integer getKelompokShiftByIdPegawai(@Param("idPegawai") Integer idPegawai); - @Query("select new Map(jab.id as id, jab.namaJabatan as namaJabatan) " - + "from Pegawai peg left join peg.jabatanFungsional jab " + "where peg.statusEnabled is true " - + "and jab.statusEnabled is true " + "and peg.id = :idPegawai") - Map getJabatanFungsionalByPegawai(@Param("idPegawai") Integer idPegawai); - - @Query("select new Map (ese.id as idEselon,ese.eselon as eselon) " + "from MapPegawaiJabatanToUnitKerja mapp " - + "left join mapp.jabatan jab " + "left join jab.eselon ese " - + "where mapp.statusEnabled is true and jab.statusEnabled is true and ese.statusEnabled is true " - + "and jab.jenisJabatanId = 5 and lower(jab.namaJabatan) not like lower('Plh%') and mapp.pegawaiId = :idPegawai") - Map getEselonStruktural(@Param("idPegawai") Integer idPegawai); - @Query("select p.id " + "from Pegawai p," + "JenisPegawai j," + "SettingDataFixed s " + "where p.statusEnabled is true " + "and p.jenisPegawaiId = j.id " + "and p.jenisPegawaiId = cast(s.nilaiField as int) " + "and j.id = cast(s.nilaiField as int) " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java index 01355344..4856ec81 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java @@ -1,118 +1,102 @@ package com.jasamedika.medifirst2000.service; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex; import com.jasamedika.medifirst2000.vo.JatahCutiDanIzinVO; import com.jasamedika.medifirst2000.vo.KelompokShiftKerjaCustomVO; import com.jasamedika.medifirst2000.vo.ListTanggalCutiVO; import com.jasamedika.medifirst2000.vo.PlanningPegawaiStatusVO; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; + public interface PermohonanStatusPegawaiService { - public Map getUserLogin(Integer idPegawai); + Map getUserLogin(Integer idPegawai); - public Map noUsulan(); + Map noUsulan(); - public Map getLoadData(Integer ruanganId); + Map getLoadData(Integer ruanganId); - public Map getDataPermohonanStatus(Integer id); + Map getDataPermohonanStatus(Integer id); - public Map getDataMapPermohonanStatus(Integer id); + Map getDataMapPermohonanStatus(Integer id); - public Map getDataCuti(Integer pegawaiId, String year, Integer statusPegawaiId); + Map getDataCuti(Integer pegawaiId, String year, Integer statusPegawaiId); - public Map savePlanningPegawaiStatus(PlanningPegawaiStatusVO vo); + Map savePlanningPegawaiStatus(PlanningPegawaiStatusVO vo); - public Map perbaruiDataCuti(Integer idPegawai, Integer idStatusPegawai); + Map perbaruiDataCuti(Integer idPegawai, Integer idStatusPegawai); - public Map savePlanningPegawaiStatusRev(PlanningPegawaiStatusVO vo); - - public boolean validateTanggalPermohonan(Integer statusPegawaiPlanId, Set listTanggalCutiVO, + boolean validateTanggalPermohonanRev(Integer statusPegawaiPlanId, Set listTanggalCutiVO, Integer idPegawai); - public boolean validateTanggalPermohonanRev(Integer statusPegawaiPlanId, Set listTanggalCutiVO, - Integer idPegawai); + boolean validateTanggalPermohonanRev(List listTgl, Integer idPegawai); - public boolean validateTanggalPermohonan(Integer statusPegawaiPlanId, List listTgl, Integer idPegawai); + Map getListPermohonanStatus(Integer ruanganId); - public boolean validateTanggalPermohonanRev(List listTgl, Integer idPegawai); + Map getListPermohonanStatusPegawai(Boolean sdm); - public Map getListPermohonanStatus(Integer ruanganId); - - public Map getListPermohonanStatusPegawai(Boolean sdm); - - public Map getListPermohonanStatusPegawaiPaging(Integer page, Integer limit, String sort, - String dir, Integer idPegawai, String nama, String jenisPermohonan, Integer statusPermohonan, - Boolean isSdm); - - public Map getListPermohonanStatusPegawaiPaging(Integer page, Integer limit, String sort, - String dir, Integer idPegawai, String nama, String jenisPermohonan, Integer statusPermohonan, - String tglPermohonan, Boolean isSdm, Boolean isCutiLuarNegeri, Boolean isCutiLuarKota); - - public Map penangguhanPerubahanStatusKehadiran(PlanningPegawaiStatusVO vo); - - public Map getApprovalStatus(Integer idPegawai); - - public List> getListTanggalPermohonan(Integer idPegawai); - - public Map getApprovalStatusPaging(Integer page, Integer limit, String sort, String dir, - Integer idPegawai, String nama, String jenisPermohonan, Integer statusPermohonan); - - public Map getApprovalStatusPaging(Integer page, Integer limit, String sort, String dir, + Map getListPermohonanStatusPegawaiPaging(Integer page, Integer limit, String sort, String dir, Integer idPegawai, String nama, String jenisPermohonan, Integer statusPermohonan, String tglPermohonan, + Boolean isSdm, Boolean isCutiLuarNegeri, Boolean isCutiLuarKota); + + Map penangguhanPerubahanStatusKehadiran(PlanningPegawaiStatusVO vo); + + Map getApprovalStatus(Integer idPegawai); + + List> getListTanggalPermohonan(Integer idPegawai); + + Map getApprovalStatusPaging(Integer page, Integer limit, String sort, String dir, Integer idPegawai, + String nama, String jenisPermohonan, Integer statusPermohonan); + + Map getApprovalStatusPaging(Integer page, Integer limit, String sort, String dir, Integer idPegawai, + String nama, String jenisPermohonan, Integer statusPermohonan, String tglPermohonan, Boolean isCutiLuarNegeri, Boolean isCutiLuarKota); - public Map getApprovalStatusByNorecPlanning(Integer idPegawai, String noRec); + Map getApprovalStatusByNorecPlanning(Integer idPegawai, String noRec); - public Map getApprovalStatusByStatusPegawaiPlan(Integer idPegawai, Integer statusPegawaiPlanId); + Map getApprovalStatusByStatusPegawaiPlan(Integer idPegawai, Integer statusPegawaiPlanId); - public Map approvalPermohonanStatus(PlanningPegawaiStatusVO vo); + Map approvalPermohonanStatus(PlanningPegawaiStatusVO vo); - public Map checkKelompokShiftKerja(PlanningPegawaiStatusVO vo, Integer statusPegawaiId, + Map checkKelompokShiftKerja(PlanningPegawaiStatusVO vo, Integer statusPegawaiId, String noRecPlanning); - public Map savePegawaiHistoriRekapIndex(PlanningPegawaiStatusVO vo, + Map savePegawaiHistoriRekapIndex(PlanningPegawaiStatusVO vo, PegawaiHistoriRekapIndex pegawaiHistoriRekapIndex, Integer kelomokIndexId, String noRecPlanning); - public Map unVerifPermohonanStatus(PlanningPegawaiStatusVO vo); + Map unVerifPermohonanStatus(PlanningPegawaiStatusVO vo); - public String getRunningNumber(String kegunaan); + String getRunningNumber(String kegunaan); - public Map setJatahCuti(KelompokShiftKerjaCustomVO vo); + Map setJatahCuti(KelompokShiftKerjaCustomVO vo); - public Map setJatahCutiPegawai(JatahCutiDanIzinVO vo); + Map setJatahCutiPegawai(JatahCutiDanIzinVO vo); - public Map setJatahCutiRecursive(KelompokShiftKerjaCustomVO vo); + Map setJatahCutiRecursive(KelompokShiftKerjaCustomVO vo); - public Map setJatahCutiPegawaiRecursive(JatahCutiDanIzinVO vo); + Map setJatahCutiPegawaiRecursive(JatahCutiDanIzinVO vo); - public List> getAllDataCuti(); + List> getAllDataCuti(); - public List> getAllDataCuti(Integer idPegawai); + List> getAllDataCuti(Integer idPegawai); - public Map updatePlanningPegawaiStatus(PlanningPegawaiStatusVO vo); + Map updatePlanningPegawaiStatus(PlanningPegawaiStatusVO vo); - public Map deletePlanningPegawaiStatus(String noRec); + Map deletePlanningPegawaiStatus(String noRec); - public JatahCutiDanIzinVO setJatahCutiDanIzinVo(Integer idPegawai, Integer idStatusPegawai); + JatahCutiDanIzinVO setJatahCutiDanIzinVo(Integer idPegawai, Integer idStatusPegawai); - public Integer difCutiTerpakai(Integer cutiTerpakai, Integer dataCuti); + Integer difCutiTerpakai(Integer cutiTerpakai, Integer dataCuti); - public Integer countSisaCuti(Integer dataCuti, Integer cutiTerpakai, Integer cutiBersama, Boolean isTangguhkan); + Integer countJumlahPengajuanDiprosesByPegawai(Integer idPegawai, Integer idPlan); - public Integer countJumlahPengajuanDiprosesByPegawai(Integer idPegawai, Integer idPlan); + Integer countJumlahPengajuanDiprosesByPegawai(Integer idPegawai, Integer idPlan, String noPlanning); - public Integer countJumlahPengajuanDiprosesByPegawai(Integer idPegawai, Integer idPlan, String noPlanning); + Integer countJumlahPengajuanTahunDepanDiprosesByPegawai(Integer idPegawai, Integer idPlan); - public Integer countJumlahPengajuanTahunDepanDiprosesByPegawai(Integer idPegawai, Integer idPlan); - - public Integer countJumlahPengajuanTahunDepanDiprosesByPegawai(Integer idPegawai, Integer idPlan, - String noPlanning); - - public Map checkPermohonanStatusPegawai(String norec); + Integer countJumlahPengajuanTahunDepanDiprosesByPegawai(Integer idPegawai, Integer idPlan, String noPlanning); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index 3abf56d6..f5ec1676 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -1,24 +1,16 @@ package com.jasamedika.medifirst2000.service.impl; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.DateFormat; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - +import com.jasamedika.medifirst2000.constants.Master; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.SkoringTindakanMedisDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService; +import com.jasamedika.medifirst2000.service.LogbookKinerjaService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; import org.joda.time.Chronology; import org.joda.time.LocalDate; import org.joda.time.chrono.IslamicChronology; @@ -27,56 +19,14 @@ import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jasamedika.medifirst2000.constants.Master; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.AnggaranRemunerasiDao; -import com.jasamedika.medifirst2000.dao.BobotJenisIndikatorDao; -import com.jasamedika.medifirst2000.dao.IkiDanRemunerasiDao; -import com.jasamedika.medifirst2000.dao.IndikatorKinerjaDao; -import com.jasamedika.medifirst2000.dao.IndikatorKinerjaDetailDao; -import com.jasamedika.medifirst2000.dao.IndikatorKinerjaJabatanDao; -import com.jasamedika.medifirst2000.dao.JabatanDao; -import com.jasamedika.medifirst2000.dao.KalenderDao; -import com.jasamedika.medifirst2000.dao.LogbookKinerjaDao; -import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailDao; -import com.jasamedika.medifirst2000.dao.LogbookKinerjaDokterDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiLaboratRadiologiDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PelayananFarmakologiDao; -import com.jasamedika.medifirst2000.dao.PelayananNakesDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienNakesDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienPerawatDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienPetugasDao; -import com.jasamedika.medifirst2000.dao.SettingDataFixedDao; -import com.jasamedika.medifirst2000.dao.ShiftKerjaDao; -import com.jasamedika.medifirst2000.dao.SkoringTindakanMedisDao; -import com.jasamedika.medifirst2000.dao.TabelAcuanIndeksIKIDao; -import com.jasamedika.medifirst2000.dao.TargetSkorDokterDetailDao; -import com.jasamedika.medifirst2000.dao.custom.SkoringTindakanMedisDaoCustom; -import com.jasamedika.medifirst2000.entities.IndikatorKinerja; -import com.jasamedika.medifirst2000.entities.IndikatorKinerjaDetail; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.Kalender; -import com.jasamedika.medifirst2000.entities.LogbookKinerja; -import com.jasamedika.medifirst2000.entities.LogbookKinerjaDokter; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PelayananNakes; -import com.jasamedika.medifirst2000.entities.PelayananPasienNakes; -import com.jasamedika.medifirst2000.entities.PelayananPasienPerawat; -import com.jasamedika.medifirst2000.entities.SatuanIndikator; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService; -import com.jasamedika.medifirst2000.service.LogbookKinerjaService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.IndikatorKinerjaVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.LogbookKinerjaVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.ReferensiSkorAnestesiVO; -import com.jasamedika.medifirst2000.vo.SatuanIndikatorVO; -import com.jasamedika.medifirst2000.vo.SkorDokterVO; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.*; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; @Service("LogbookKinerjaService") public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements LogbookKinerjaService { @@ -249,9 +199,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } if (CommonUtil.isNullOrEmpty(resultVO.getResponseMessage()) && !vo.getStatusEnabled()) { - /** - * Hapus komponen detail kontrak kinerja - */ + // Hapus komponen detail kontrak kinerja logbookKinerjaDokterDao.delete(listLogbookDetail); LogbookKinerja resultModel = logbookKinerjaDao.save(logbookKinerjaBaru); @@ -296,17 +244,14 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb @Override public List findAll() throws JpaSystemException { - List result = new ArrayList(); - + List result = new ArrayList<>(); Iterable models = logbookKinerjaDao.findAll(); - if (CommonUtil.isNotNullOrEmpty(models)) { + if (CommonUtil.isNotNullOrEmpty(models)) for (LogbookKinerja model : models) { LogbookKinerjaVO vo = new LogbookKinerjaVO(); vo = logbookKinerjaConverter.transferModelToVO(model, vo); result.add(vo); } - } - return result; } @@ -420,19 +365,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb LogbookKinerja logbookKinerjaBaru = logbookKinerjaConverter.transferVOToModel(vo, logbookKinerjaLama); indikatorKinerjaBaru.setSatuanIndikator(satuanIndikator); - if (vo.getIndikatorKinerja().getStatusVerifikasi()) { - indikatorKinerjaBaru.setStatusEnabled(true); - } else { - indikatorKinerjaBaru.setStatusEnabled(false); - } + indikatorKinerjaBaru.setStatusEnabled(vo.getIndikatorKinerja().getStatusVerifikasi()); indikatorKinerjaBaru.setKdProfile((short) 0); logbookKinerjaBaru.setPegawai(pegawai); logbookKinerjaBaru.setJabatan(jabatan); - if (vo.getStatusVerifikasi()) { - logbookKinerjaBaru.setStatusEnabled(true); - } else { - logbookKinerjaBaru.setStatusEnabled(false); - } + logbookKinerjaBaru.setStatusEnabled(vo.getStatusVerifikasi()); logbookKinerjaBaru.setKdProfile((short) 0); logbookKinerjaBaru.setIndikatorKinerja(indikatorKinerjaBaru); @@ -448,41 +385,32 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb @Override public List> findPengajuanKontrakKinerja(Integer idPegawai, Integer idJabatan) throws JpaSystemException { - List> result = logbookKinerjaDao.findPengajuanIndikatorByPegawaiJabatan(idPegawai, - idJabatan); - - return result; + return logbookKinerjaDao.findPengajuanIndikatorByPegawaiJabatan(idPegawai, idJabatan); } @Override public List> findDupKontrakKinerja(Integer idPegawai, Integer idJabatan, Long bulan, Integer idIndikator) throws JpaSystemException { DateFormat df = new SimpleDateFormat("yyyy-MM"); - - List> result = logbookKinerjaDao.findDupKontrakKinerja(idPegawai, idJabatan, - df.format(new Date(bulan)), idIndikator); - - return result; + return logbookKinerjaDao.findDupKontrakKinerja(idPegawai, idJabatan, df.format(new Date(bulan)), idIndikator); } private Integer hitungTargetHariKerja(Date bulan) { Date start = DateUtil.startMonth(bulan); Date end = DateUtil.endMonth(bulan); List targetPresensi = kalenderDao.getTargetKerja(start, end); - Integer result = targetPresensi.size(); - - return result; + return targetPresensi.size(); } private Double hitungTargetMenitKerja(Date bulan) { - Double result = 0.0; + double result = 0.0; Chronology hijri = IslamicChronology.getInstance(); Date start = DateUtil.startMonth(bulan); Date end = DateUtil.endMonth(bulan); List targetPresensi = kalenderDao.getTargetKerja(start, end); - Integer jumlahHariKerjaHarian = 0; - Integer jumlahHariKerjaRamadhan = 0; + int jumlahHariKerjaHarian = 0; + int jumlahHariKerjaRamadhan = 0; for (Kalender kalender : targetPresensi) { LocalDate hijriDate = new LocalDate(kalender.getTanggal().getTime(), hijri); if (hijriDate.getMonthOfYear() == 9) { @@ -492,8 +420,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - result += jumlahHariKerjaHarian.doubleValue() * Master.MENIT_KERJA_HARIAN; - result += jumlahHariKerjaRamadhan.doubleValue() * Master.MENIT_KERJA_RAMADHAN; + result += (double) jumlahHariKerjaHarian * Master.MENIT_KERJA_HARIAN; + result += (double) jumlahHariKerjaRamadhan * Master.MENIT_KERJA_RAMADHAN; return result; } @@ -520,9 +448,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> data = logbookKinerjaDao.findKontrakKinerja(idPegawai, idJabatan, mf.format(new Date(bulan))); - /** - * Mengecek status indikator yang memiliki komponen detail - */ + // Mengecek status indikator yang memiliki komponen detail boolean isKualitasDokterExisted = false; for (Map map : data) { if (Master.IndikatorKinerja.KEPATUHAN_PELAYANAN_MEDIS.equals(map.get("indikatorId")) @@ -537,9 +463,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (!listIdIndikator.contains(map.get("indikatorId"))) { listIdIndikator.add(Integer.valueOf(map.get("indikatorId").toString())); - /** - * Komponen target kuantitas indikator pelayanan medis - */ + // Komponen target kuantitas indikator pelayanan medis if (map.get("indikatorId").equals(Master.IndikatorKinerja.PELAYANAN_MEDIS_JAM_KERJA)) { List target = targetSkorDokterDetailDao.findTargetByPegawai(idPegawai, endMonth, startYear, endYear); @@ -550,9 +474,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - /** - * Komponen target kualitas indikator pelayanan medis - */ + // Komponen target kualitas indikator pelayanan medis if (map.get("indikatorId").equals(Master.IndikatorKinerja.KEPATUHAN_PELAYANAN_MEDIS) && isKualitasDokterExisted) { List> detailIndikator2 = logbookKinerjaDokterDao.findDetailLogbookDokter( @@ -645,7 +567,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - for (Integer idJenisIndikator : Arrays.asList(Master.Remunerasi.JENIS_INDIKATOR)) { + for (Integer idJenisIndikator : Master.Remunerasi.JENIS_INDIKATOR) { List> resByJenisIndikator = new ArrayList<>(); for (Map res : listRes) { if (res.get("jenisIndikatorId").equals(idJenisIndikator)) { @@ -671,9 +593,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb @Override public List> findKontrakKinerja(Integer idIndikator) throws JpaSystemException { - List> result = logbookKinerjaDao.findKontrakKinerja(idIndikator); - - return result; + return logbookKinerjaDao.findKontrakKinerja(idIndikator); } public Map findAnggaranRemunerasi(Integer idPegawai, Integer idJabatan, String tahun) @@ -738,16 +658,16 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Map anggaran = findAnggaranRemunerasi(idPegawai, idJab, yf.format(new Date(bulan))); if (CommonUtil.isNotNullOrEmpty(rs) && rs.size() > 0) { - nilaiJabatan = Double.valueOf(rs.get(0).get("nilaiJabatan").toString()); + nilaiJabatan = Double.parseDouble(rs.get(0).get("nilaiJabatan").toString()); idKelompokJabatan = Integer.parseInt(rs.get(0).get("kelompokJabatanId").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()); + pir = Double.parseDouble(anggaran.get("pir").toString()); + plafonGaji = Double.parseDouble(anggaran.get("plafonGaji").toString()); + plafonInsentif = Double.parseDouble(anggaran.get("plafonInsentif").toString()); } - for (String ji : Arrays.asList(Master.JENIS_INDIKATOR)) { + for (String ji : Master.JENIS_INDIKATOR) { double hasil = 0.0; List> data = new ArrayList<>(); Map jenisIndikator = new HashMap<>(); @@ -759,15 +679,15 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> logbookDokter = findLogbookJamKerjaDokter(idPegawai, bulan); double capaian = 0.0; for (Map ld : logbookDokter) { - capaian += Double.valueOf(ld.get("tSkor").toString()); + capaian += Double.parseDouble(ld.get("tSkor").toString()); } - String fragCapaian = df.format(capaian / Double.valueOf(map.get("target").toString())); - hasil += capaian / Double.valueOf(map.get("target").toString()) - * Double.valueOf(map.get("bobot").toString()); + String fragCapaian = df.format(capaian / Double.parseDouble(map.get("target").toString())); + hasil += capaian / Double.parseDouble(map.get("target").toString()) + * Double.parseDouble(map.get("bobot").toString()); map.put("fragCapaian", Double.parseDouble(fragCapaian)); map.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf(map.get("fragCapaian").toString()) * 100).setScale(2, - RoundingMode.HALF_UP)); + BigDecimal.valueOf(Double.parseDouble(map.get("fragCapaian").toString()) * 100) + .setScale(2, RoundingMode.HALF_UP)); data.add(map); } else if (Master.IndikatorKinerja.KEPATUHAN_PELAYANAN_MEDIS.equals(map.get("idIndikator"))) { List> listDetail = logbookKinerjaDokterDao.findDetailLogbookDokter( @@ -781,14 +701,14 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Map presensiVisite = cpptService.findPresensiVisiteDokter(idPegawai, bulan); if (CommonUtil.isNotNullOrEmpty(presensiVisite)) { - if (Double.valueOf(presensiVisite.get("rataCapaian").toString()) >= Double - .valueOf(detail.get("detailTarget").toString())) { - persenCapaian += Double.valueOf(detail.get("detailTarget").toString()) - / Double.valueOf(detail.get("detailTarget").toString()); + if (Double.parseDouble(presensiVisite.get("rataCapaian").toString()) >= Double + .parseDouble(detail.get("detailTarget").toString())) { + persenCapaian += Double.parseDouble(detail.get("detailTarget").toString()) + / Double.parseDouble(detail.get("detailTarget").toString()); } else { persenCapaian += Double - .valueOf(presensiVisite.get("rataCapaian").toString()) - / Double.valueOf(detail.get("detailTarget").toString()); + .parseDouble(presensiVisite.get("rataCapaian").toString()) + / Double.parseDouble(detail.get("detailTarget").toString()); } } } @@ -799,13 +719,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb capaian = persenCapaian / detailSize; } - String fragCapaian = df.format(capaian * Double.valueOf(map.get("target").toString())); - hasil += capaian * Double.valueOf(map.get("target").toString()) / 100 - * Double.valueOf(map.get("bobot").toString()); + String fragCapaian = df.format(capaian * Double.parseDouble(map.get("target").toString())); + hasil += capaian * Double.parseDouble(map.get("target").toString()) / 100 + * Double.parseDouble(map.get("bobot").toString()); map.put("fragCapaian", Double.parseDouble(fragCapaian)); map.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf(map.get("fragCapaian").toString())).setScale(2, - RoundingMode.HALF_UP)); + BigDecimal.valueOf(Double.parseDouble(map.get("fragCapaian").toString())) + .setScale(2, RoundingMode.HALF_UP)); data.add(map); } else if (Master.IndikatorKinerja.PELAYANAN_NAKES.equals(map.get("idIndikator"))) { List listPelayananPasien = pelayananPasienNakesDao @@ -821,13 +741,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb capaian += pelayananNonpasien.getJumlah() * pelayananNonpasien.getSkor(); } - String fragCapaian = df.format(capaian / Double.valueOf(map.get("target").toString())); - hasil += capaian / Double.valueOf(map.get("target").toString()) - * Double.valueOf(map.get("bobot").toString()); + String fragCapaian = df.format(capaian / Double.parseDouble(map.get("target").toString())); + hasil += capaian / Double.parseDouble(map.get("target").toString()) + * Double.parseDouble(map.get("bobot").toString()); map.put("fragCapaian", Double.parseDouble(fragCapaian)); map.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf(map.get("fragCapaian").toString()) * 100).setScale(2, - RoundingMode.HALF_UP)); + BigDecimal.valueOf(Double.parseDouble(map.get("fragCapaian").toString()) * 100) + .setScale(2, RoundingMode.HALF_UP)); data.add(map); } else if (Master.IndikatorKinerja.PELAYANAN_PERAWAT.equals(map.get("idIndikator"))) { List listPelayananPasien = pelayananPasienPerawatDao @@ -838,60 +758,62 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb capaian += pelayananPasien.getJumlah() * pelayananPasien.getSkor(); } - String fragCapaian = df.format(capaian / Double.valueOf(map.get("target").toString())); - hasil += capaian / Double.valueOf(map.get("target").toString()) - * Double.valueOf(map.get("bobot").toString()); + String fragCapaian = df.format(capaian / Double.parseDouble(map.get("target").toString())); + hasil += capaian / Double.parseDouble(map.get("target").toString()) + * Double.parseDouble(map.get("bobot").toString()); map.put("fragCapaian", Double.parseDouble(fragCapaian)); map.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf(map.get("fragCapaian").toString()) * 100).setScale(2, - RoundingMode.HALF_UP)); + BigDecimal.valueOf(Double.parseDouble(map.get("fragCapaian").toString()) * 100) + .setScale(2, RoundingMode.HALF_UP)); data.add(map); } else { hasil += Double.parseDouble(df.format(Double.valueOf(map.get("fragCapaian").toString()))) - * Double.valueOf(map.get("bobot").toString()); + * Double.parseDouble(map.get("bobot").toString()); map.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf(map.get("fragCapaian").toString()) * 100).setScale(2, - RoundingMode.HALF_UP)); + BigDecimal.valueOf(Double.parseDouble(map.get("fragCapaian").toString()) * 100) + .setScale(2, RoundingMode.HALF_UP)); data.add(map); } } } - if (ji.equals("Kuantitas")) { + switch (ji) { + case "Kuantitas": totAllPersen += hasil; jenisIndikator.put("persenCapaian", (100.0 / persenIndikator.get(0)) * hasil); jenisIndikator.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf((100.0 / persenIndikator.get(0)) * hasil)).setScale(2, - RoundingMode.HALF_UP)); - } else if (ji.equals("Kualitas")) { + new BigDecimal((100.0 / persenIndikator.get(0)) * hasil).setScale(2, RoundingMode.HALF_UP)); + break; + case "Kualitas": totAllPersen += hasil; jenisIndikator.put("persenCapaian", (100.0 / persenIndikator.get(1)) * hasil); jenisIndikator.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf((100.0 / persenIndikator.get(1)) * hasil)).setScale(2, - RoundingMode.HALF_UP)); - } else if (ji.equals("Perilaku")) { + new BigDecimal((100.0 / persenIndikator.get(1)) * hasil).setScale(2, RoundingMode.HALF_UP)); + break; + case "Perilaku": totAllPersen += hasil; jenisIndikator.put("persenCapaian", (100.0 / persenIndikator.get(2)) * hasil); jenisIndikator.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf((100.0 / persenIndikator.get(2)) * hasil)).setScale(2, - RoundingMode.HALF_UP)); + new BigDecimal((100.0 / persenIndikator.get(2)) * hasil).setScale(2, RoundingMode.HALF_UP)); + break; } jenisIndikator.put("data", data); listJenisIndikator.add(jenisIndikator); } - Double iki = 0.0; + double iki = 0.0; if (Arrays.asList(Master.KelompokJabatan.DIR_MS).contains(idKelompokJabatan)) { List> acuanIndeks = tabelAcuanIndeksIKIDao .findAllAcuanIndeks(Master.TabelAcuanIndeksIKI.MAX_DIR_MS); for (Map aiki : acuanIndeks) { - if ((Double.valueOf(aiki.get("nilaiBawah").toString()) < Double.parseDouble(df.format(totAllPersen)) + if ((Double.parseDouble(aiki.get("nilaiBawah").toString()) < Double + .parseDouble(df.format(totAllPersen)) && Double.parseDouble(df.format(totAllPersen)) <= Double - .valueOf(aiki.get("nilaiAtas").toString())) + .parseDouble(aiki.get("nilaiAtas").toString())) || (Double.parseDouble(df.format(totAllPersen)) > 1000 - && Double.valueOf(aiki.get("nilaiAtas").toString()) == 1000)) { - iki = Double.valueOf(aiki.get("iki").toString()); + && Double.parseDouble(aiki.get("nilaiAtas").toString()) == 1000)) { + iki = Double.parseDouble(aiki.get("iki").toString()); break; } @@ -900,44 +822,44 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> acuanIndeks = tabelAcuanIndeksIKIDao .findAllAcuanIndeks(Master.TabelAcuanIndeksIKI.MAX_OTHERS); for (Map aiki : acuanIndeks) { - if ((Double.valueOf(aiki.get("nilaiBawah").toString()) < Double.parseDouble(df.format(totAllPersen)) + if ((Double.parseDouble(aiki.get("nilaiBawah").toString()) < Double + .parseDouble(df.format(totAllPersen)) && Double.parseDouble(df.format(totAllPersen)) <= Double - .valueOf(aiki.get("nilaiAtas").toString())) + .parseDouble(aiki.get("nilaiAtas").toString())) || (Double.parseDouble(df.format(totAllPersen)) > 160 - && Double.valueOf(aiki.get("nilaiAtas").toString()) == 160)) { - iki = Double.valueOf(aiki.get("iki").toString()); + && Double.parseDouble(aiki.get("nilaiAtas").toString()) == 160)) { + iki = Double.parseDouble(aiki.get("iki").toString()); break; } } } - double targetRupiahP1 = nilaiJabatan * Master.Remunerasi.IK_STANDAR * pir * Master.Remunerasi.PERSEN_P1; + double targetRupiahP1 = nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1; double targetRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P2; - double capaianRupiahP1 = nilaiJabatan * Master.Remunerasi.IK_STANDAR * pir * Master.Remunerasi.PERSEN_P1; + double capaianRupiahP1 = nilaiJabatan * Master.Remunerasi.IKI_STANDAR * pir * Master.Remunerasi.PERSEN_P1; double capaianRupiahP2 = nilaiJabatan * Master.Remunerasi.IKU * iki * pir * Master.Remunerasi.PERSEN_P2; if (CommonUtil.isNotNullOrEmpty(idJabatan)) { rsMap.put("listJenisIndikator", listJenisIndikator); - rsMap.put("plafonP1", kursINA.format(plafonGaji).toString()); + rsMap.put("plafonP1", kursINA.format(plafonGaji)); rsMap.put("rupiahTargetP1", targetRupiahP1); - rsMap.put("rupiahTargetFormatP1", kursINA.format(targetRupiahP1).toString()); + rsMap.put("rupiahTargetFormatP1", kursINA.format(targetRupiahP1)); rsMap.put("rupiahCapaianP1", capaianRupiahP1); - rsMap.put("rupiahCapaianP1Format", kursINA.format(capaianRupiahP1).toString()); + rsMap.put("rupiahCapaianP1Format", kursINA.format(capaianRupiahP1)); - rsMap.put("plafonP2", kursINA.format(plafonInsentif).toString()); + rsMap.put("plafonP2", kursINA.format(plafonInsentif)); rsMap.put("rupiahTargetP2", targetRupiahP2); - rsMap.put("rupiahTargetFormatP2", kursINA.format(targetRupiahP2).toString()); + rsMap.put("rupiahTargetFormatP2", kursINA.format(targetRupiahP2)); rsMap.put("rupiahCapaianP2", capaianRupiahP2); - rsMap.put("rupiahCapaianP2Format", kursINA.format(capaianRupiahP2).toString()); + rsMap.put("rupiahCapaianP2Format", kursINA.format(capaianRupiahP2)); } rsMap.put("persenCapaian", totAllPersen); - rsMap.put("persenCapaianDibulatkan", - new BigDecimal(Double.valueOf(totAllPersen)).setScale(2, RoundingMode.HALF_UP)); + rsMap.put("persenCapaianDibulatkan", BigDecimal.valueOf(totAllPersen).setScale(2, RoundingMode.HALF_UP)); resData.add(rsMap); } @@ -951,9 +873,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb public List> findAksesPegawai(Integer idPegawai, List listIdKelompokJabatan) { List> result = new ArrayList<>(); List> rsAll = new ArrayList<>(); - List> aksesByStaf = new ArrayList<>(); - List> aksesByAtasan = new ArrayList<>(); - List> aksesByPenilai = new ArrayList<>(); + List> aksesByStaf; + List> aksesByAtasan; + List> aksesByPenilai; List listPurnaWaktu = Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU); @@ -1027,9 +949,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } public List> findUsedWorkingRecordByKontrak(String logbookNoRec) throws JpaSystemException { - List> result = logbookKinerjaDetailDao.findUsedWorkingRecordByKontrak(logbookNoRec); - - return result; + return logbookKinerjaDetailDao.findUsedWorkingRecordByKontrak(logbookNoRec); } @Override @@ -1039,8 +959,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List listIdIndikator = new ArrayList<>(); List listIdProduk = new ArrayList<>(); List listSkor = new ArrayList<>(); - List listDetailJenisProduk = new ArrayList<>(); - List listDetailJenisProdukException = new ArrayList<>(); + List listDetailJenisProduk; + List listDetailJenisProdukException; DateFormat mf = new SimpleDateFormat("yyyy-MM"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -1082,14 +1002,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> dataLayanan = ikiDanRemunerasiDao.getDataLogbookJamKerjaDokter( mf.format(new Date(bulan)), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, - Arrays.asList(idPegawai), Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), listDetailJenisProduk, - splitDataSettingDatafixed("pr_dokter_umum_igd"), drKsmUmumList, Master.Departemen.IGD, - Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), - Master.Produk.KARCIS); + Collections.singletonList(idPegawai), Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), + listDetailJenisProduk, splitDataSettingDatafixed("pr_dokter_umum_igd"), drKsmUmumList, + Master.Departemen.IGD, Arrays.asList(Master.JenisProduk.NONTINDAKAN), + Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); - /** - * Menghitung skor asa dokter anestesi - */ + // Menghitung skor asa dokter anestesi List listIdPelayananAnestesi = new ArrayList<>(); { List> dataLayananAnestesi = new ArrayList<>(); @@ -1143,9 +1061,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb listRefSkor); } - /** - * Skor dokter anestesi (bukan tindakan mandiri) - */ + // Skor dokter anestesi (bukan tindakan mandiri) for (ReferensiSkorAnestesiVO refSkor : listRefSkor) { for (Map mapLayanan : dataLayananAnestesi) { for (Map mapSkor : dataSkorAnestesi) { @@ -1177,19 +1093,18 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && refSkor.getKelompokKerjaId() .equals(Integer.valueOf(mapSkor.get("kelompokKerjaId").toString())) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { if (!mapLayanan.containsKey("skor")) { if (refSkor.getAsaId() >= 3) { - double skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); + double skor = 0.8 * Double.parseDouble(mapSkor.get("skor").toString()); mapLayanan.put("skor", skor); break; } else if (refSkor.getAsaId() == 2) { - double skor = 0.5 * Double.valueOf(mapSkor.get("skor").toString()); + double skor = 0.5 * Double.parseDouble(mapSkor.get("skor").toString()); mapLayanan.put("skor", skor); break; } else if (refSkor.getAsaId() == 1) { - double skor = 0.4 * Double.valueOf(mapSkor.get("skor").toString()); + double skor = 0.4 * Double.parseDouble(mapSkor.get("skor").toString()); mapLayanan.put("skor", skor); break; } @@ -1211,7 +1126,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } List> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter( - mf.format(new Date(bulan)), Arrays.asList(idPegawai), Arrays.asList(Master.UnitKerja.KSM)); + mf.format(new Date(bulan)), Collections.singletonList(idPegawai), Arrays.asList(Master.UnitKerja.KSM)); // SCORE for (Map mapLayanan : dataLayanan) { @@ -1219,8 +1134,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (!listIdPelayananAnestesi.contains(mapLayanan.get("noRec")) && !mapLayanan.containsKey("skor") && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { mapLayanan.put("skor", mapSkor.get("skor")); break; } @@ -1234,7 +1148,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : dataLayanan) { if (Integer.valueOf(mapLayanan.get("jenisPetugasId").toString()) .equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) - && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { // tidak_dapat_skor_untuk_diskon_dpjp @@ -1243,20 +1157,25 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } else if (!mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) && listRuangEks.contains(mapLayanan.get("ruanganId"))) { - mapLayanan.put("skor", Double.parseDouble(decf.format( - Double.valueOf(mapLayanan.get("skor").toString()) * Master.Remunerasi.PERSEN_SKOR_EKSEKUTIF))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("skor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Master.Remunerasi.PERSEN_SKOR_EKSEKUTIF))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } else if (mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - mapLayanan.put("skor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Master.Remunerasi.PERSEN_SKOR_ASISTEN_SPESIALIS))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("skor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Master.Remunerasi.PERSEN_SKOR_ASISTEN_SPESIALIS))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } else { mapLayanan.put("skor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString())))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } } @@ -1331,8 +1250,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor")) && tglPelayanan.equals(df.format(((Date) mapLayanan.get("tglPelayanan"))))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); data.putAll(mapLayanan); data.put("tglPelayanan", df.format(((Date) mapLayanan.get("tglPelayanan")))); } @@ -1359,8 +1278,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : dataTglPelayanan) { if (idIndikator.equals(mapLayanan.get("indikatorId")) && idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); Map mapDetail = new HashMap<>(); mapDetail.put("jumlah", mapLayanan.get("jumlah")); @@ -1396,8 +1315,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List listTglPelayanan = new ArrayList<>(); List listIdIndikator = new ArrayList<>(); List listIdProduk = new ArrayList<>(); - List listDetailJenisProduk = new ArrayList<>(); - List listDetailJenisProdukException = new ArrayList<>(); + List listDetailJenisProduk; + List listDetailJenisProdukException; List listSkor = new ArrayList<>(); DateFormat mf = new SimpleDateFormat("yyyy-MM"); @@ -1445,9 +1364,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); - /** - * Menghitung skor asa dokter anestesi - */ + // Menghitung skor asa dokter anestesi List listIdPelayananAnestesi = new ArrayList<>(); { List> dataLayananAnestesi = new ArrayList<>(); @@ -1501,9 +1418,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb listRefSkor); } - /** - * Skor dokter anestesi (bukan tindakan mandiri) - */ + // Skor dokter anestesi (bukan tindakan mandiri) for (ReferensiSkorAnestesiVO refSkor : listRefSkor) { for (Map mapLayanan : dataLayananAnestesi) { for (Map mapSkor : dataSkorAnestesi) { @@ -1520,15 +1435,14 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && refSkor.getKelompokKerjaId() .equals(Integer.valueOf(mapSkor.get("kelompokKerjaId").toString())) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { - double skor = 0.0; + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { + double skor; if (refSkor.getAsaId() >= 3) { - skor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); + skor = 0.8 * Double.parseDouble(mapSkor.get("skor").toString()); } else if (refSkor.getAsaId() == 2) { - skor = 0.5 * Double.valueOf(mapSkor.get("skor").toString()); + skor = 0.5 * Double.parseDouble(mapSkor.get("skor").toString()); } else { - skor = 0.4 * Double.valueOf(mapSkor.get("skor").toString()); + skor = 0.4 * Double.parseDouble(mapSkor.get("skor").toString()); } mapLayanan.put("skor", skor); break; @@ -1539,7 +1453,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } List> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter( - mf.format(new Date(bulan)), Arrays.asList(idPegawai), Arrays.asList(Master.UnitKerja.KSM)); + mf.format(new Date(bulan)), Collections.singletonList(idPegawai), Arrays.asList(Master.UnitKerja.KSM)); // SCORE for (Map mapLayanan : dataLayanan) { @@ -1547,8 +1461,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (!listIdPelayananAnestesi.contains(mapLayanan.get("noRec")) && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { mapLayanan.put("skor", mapSkor.get("skor")); break; } @@ -1562,7 +1475,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : dataLayanan) { if (Integer.valueOf(mapLayanan.get("jenisPetugasId").toString()) .equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) - && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { // tidak_dapat_skor_untuk_diskon_dpjp @@ -1571,22 +1484,27 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } else if (!mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) && listRuangEks.contains(mapLayanan.get("ruanganId"))) { - mapLayanan.put("skor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Master.Remunerasi.PERSEN_SKOR_LUAR_JAM_KERJA))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("skor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Master.Remunerasi.PERSEN_SKOR_LUAR_JAM_KERJA))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } else if (mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { mapLayanan.put("skor", - Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) * Master.Remunerasi.PERSEN_SKOR_LUAR_JAM_KERJA * Master.Remunerasi.PERSEN_SKOR_ASISTEN_SPESIALIS))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } else { - mapLayanan.put("skor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Master.Remunerasi.PERSEN_SKOR_LUAR_JAM_KERJA))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("skor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Master.Remunerasi.PERSEN_SKOR_LUAR_JAM_KERJA))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } } @@ -1661,8 +1579,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor")) && tglPelayanan.equals(df.format(((Date) mapLayanan.get("tglPelayanan"))))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); data.putAll(mapLayanan); data.put("tglPelayanan", df.format(((Date) mapLayanan.get("tglPelayanan")))); } @@ -1689,8 +1607,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : dataTglPelayanan) { if (idIndikator.equals(mapLayanan.get("indikatorId")) && idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); Map mapDetail = new HashMap<>(); mapDetail.put("jumlah", mapLayanan.get("jumlah")); @@ -1725,8 +1643,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Integer idProduk, String tglPelayanan, Integer idJenisPetugas, Double skor) { List> result = new ArrayList<>(); - List listDetailJenisProduk = new ArrayList<>(); - List listDetailJenisProdukException = new ArrayList<>(); + List listDetailJenisProduk; + List listDetailJenisProdukException; DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -1770,9 +1688,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); - /** - * Menghitung skor asa dokter anestesi - */ + // Menghitung skor asa dokter anestesi List listIdPelayananAnestesi = new ArrayList<>(); { List> dataLayananAnestesi = new ArrayList<>(); @@ -1825,9 +1741,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb dataSkorAnestesi = skoringTindakanMedisDaoCustom.findSkoringLogbookDokter(bulan, listRefSkor); } - /** - * Skor dokter anestesi (bukan tindakan mandiri) - */ + // Skor dokter anestesi (bukan tindakan mandiri) for (ReferensiSkorAnestesiVO refSkor : listRefSkor) { for (Map mapLayanan : dataLayananAnestesi) { for (Map mapSkor : dataSkorAnestesi) { @@ -1858,19 +1772,18 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && refSkor.getKelompokKerjaId() .equals(Integer.valueOf(mapSkor.get("kelompokKerjaId").toString())) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { if (!mapLayanan.containsKey("skor")) { if (refSkor.getAsaId() >= 3) { - double calcSkor = 0.8 * Double.valueOf(mapSkor.get("skor").toString()); + double calcSkor = 0.8 * Double.parseDouble(mapSkor.get("skor").toString()); mapLayanan.put("skor", calcSkor); break; } else if (refSkor.getAsaId() == 2) { - double calcSkor = 0.5 * Double.valueOf(mapSkor.get("skor").toString()); + double calcSkor = 0.5 * Double.parseDouble(mapSkor.get("skor").toString()); mapLayanan.put("skor", calcSkor); break; } else if (refSkor.getAsaId() == 1) { - double calcSkor = 0.4 * Double.valueOf(mapSkor.get("skor").toString()); + double calcSkor = 0.4 * Double.parseDouble(mapSkor.get("skor").toString()); mapLayanan.put("skor", calcSkor); break; } @@ -1892,7 +1805,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } List> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter(bulan, - Arrays.asList(idPegawai), Arrays.asList(Master.UnitKerja.KSM)); + Collections.singletonList(idPegawai), Arrays.asList(Master.UnitKerja.KSM)); // SCORE for (Map mapLayanan : dataLayanan) { @@ -1900,8 +1813,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (!listIdPelayananAnestesi.contains(mapLayanan.get("noRec")) && !mapLayanan.containsKey("skor") && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { mapLayanan.put("skor", mapSkor.get("skor")); break; } @@ -1926,7 +1838,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb || mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -1945,7 +1857,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -1968,7 +1880,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && listRuangEks.contains(mapLayanan.get("ruanganId"))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -1987,7 +1899,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2010,7 +1922,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2029,7 +1941,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2051,7 +1963,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2070,7 +1982,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2092,7 +2004,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && listRuangEks.contains(mapLayanan.get("ruanganId"))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2111,7 +2023,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2133,7 +2045,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2152,7 +2064,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2174,7 +2086,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2193,7 +2105,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2220,7 +2132,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && !mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2239,7 +2151,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2268,8 +2180,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Integer idProduk, String tglPelayanan, Integer idJenisPetugas, Double skor) { List> result = new ArrayList<>(); - List listDetailJenisProduk = new ArrayList<>(); - List listDetailJenisProdukException = new ArrayList<>(); + List listDetailJenisProduk; + List listDetailJenisProdukException; DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -2316,7 +2228,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb || mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2335,7 +2247,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2358,7 +2270,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && listRuangEks.contains(mapLayanan.get("ruanganId"))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2377,7 +2289,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2400,7 +2312,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2419,7 +2331,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2441,7 +2353,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2460,7 +2372,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2482,7 +2394,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && listRuangEks.contains(mapLayanan.get("ruanganId"))) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2501,7 +2413,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2523,7 +2435,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2542,7 +2454,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2564,7 +2476,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2583,7 +2495,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2610,7 +2522,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && !mapLayanan.get("ruanganId").equals(Master.Ruangan.OK)) { if (idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2629,7 +2541,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } else if (!idJenisPetugas.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) && !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (skor.equals(0.0) && Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { mapLayanan.remove("noRec"); @@ -2673,27 +2585,28 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb double tBobot = 0.00; double tHasil = 0.00; - for (Integer idJenisIndikator : Arrays.asList(Master.Remunerasi.JENIS_INDIKATOR)) { + for (Integer idJenisIndikator : Master.Remunerasi.JENIS_INDIKATOR) { Map jiData = new HashMap<>(); List> jiDetail = new ArrayList<>(); double jiBobot = 0.00; double jiHasil = 0.00; for (Map map : data) { if (idJenisIndikator.equals(map.get("jenisIndikatorId"))) { - String nilai = df.format(Double.valueOf(map.get("realisasi").toString()) - / Double.valueOf(map.get("target").toString())); - String hasil = df.format(Double.parseDouble(nilai) * Double.valueOf(map.get("bobot").toString())); + String nilai = df.format(Double.parseDouble(map.get("realisasi").toString()) + / Double.parseDouble(map.get("target").toString())); + String hasil = df + .format(Double.parseDouble(nilai) * Double.parseDouble(map.get("bobot").toString())); map.put("nilai", Double.parseDouble(nilai)); map.put("hasil", Double.parseDouble(hasil)); - map.put("realisasi", new BigDecimal(Double.valueOf(map.get("realisasi").toString())).setScale(2, - RoundingMode.HALF_UP)); + map.put("realisasi", BigDecimal.valueOf(Double.parseDouble(map.get("realisasi").toString())) + .setScale(2, RoundingMode.HALF_UP)); jiDetail.add(map); - jiBobot += Double.valueOf(map.get("bobot").toString()); - jiHasil += Double.valueOf(map.get("hasil").toString()); + jiBobot += Double.parseDouble(map.get("bobot").toString()); + jiHasil += Double.parseDouble(map.get("hasil").toString()); - tBobot += Double.valueOf(map.get("bobot").toString()); - tHasil += Double.valueOf(map.get("hasil").toString()); + tBobot += Double.parseDouble(map.get("bobot").toString()); + tHasil += Double.parseDouble(map.get("hasil").toString()); } } jiDetail = jiDetail.stream().sorted(Comparator.comparing(o2 -> o2.get("namaIndikator").toString())) @@ -2712,17 +2625,18 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - Double iki = 0.0; + double iki = 0.0; String kriteria = "-"; if (Arrays.asList(Master.KelompokJabatan.DIR_MS).contains(idKelompokJabatan)) { List> acuanIndeks = tabelAcuanIndeksIKIDao .findAllAcuanIndeks(Master.TabelAcuanIndeksIKI.MAX_DIR_MS); for (Map aiki : acuanIndeks) { - if ((Double.valueOf(aiki.get("nilaiBawah").toString()) < Double.parseDouble(df.format(tHasil)) - && Double.parseDouble(df.format(tHasil)) <= Double.valueOf(aiki.get("nilaiAtas").toString())) + if ((Double.parseDouble(aiki.get("nilaiBawah").toString()) < Double.parseDouble(df.format(tHasil)) + && Double.parseDouble(df.format(tHasil)) <= Double + .parseDouble(aiki.get("nilaiAtas").toString())) || (Double.parseDouble(df.format(tHasil)) > 1000 - && Double.valueOf(aiki.get("nilaiAtas").toString()) == 1000)) { - iki = Double.valueOf(aiki.get("iki").toString()); + && Double.parseDouble(aiki.get("nilaiAtas").toString()) == 1000)) { + iki = Double.parseDouble(aiki.get("iki").toString()); kriteria = aiki.get("kriteria").toString(); break; @@ -2732,11 +2646,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> acuanIndeks = tabelAcuanIndeksIKIDao .findAllAcuanIndeks(Master.TabelAcuanIndeksIKI.MAX_OTHERS); for (Map aiki : acuanIndeks) { - if ((Double.valueOf(aiki.get("nilaiBawah").toString()) < Double.parseDouble(df.format(tHasil)) - && Double.parseDouble(df.format(tHasil)) <= Double.valueOf(aiki.get("nilaiAtas").toString())) + if ((Double.parseDouble(aiki.get("nilaiBawah").toString()) < Double.parseDouble(df.format(tHasil)) + && Double.parseDouble(df.format(tHasil)) <= Double + .parseDouble(aiki.get("nilaiAtas").toString())) || (Double.parseDouble(df.format(tHasil)) > 160 - && Double.valueOf(aiki.get("nilaiAtas").toString()) == 160)) { - iki = Double.valueOf(aiki.get("iki").toString()); + && Double.parseDouble(aiki.get("nilaiAtas").toString()) == 160)) { + iki = Double.parseDouble(aiki.get("iki").toString()); kriteria = aiki.get("kriteria").toString(); break; @@ -2823,19 +2738,19 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Map rsMap = new HashMap<>(); double tHasil = 0.00; - for (Integer idJI : Arrays.asList(Master.Remunerasi.JENIS_INDIKATOR)) { + for (Integer idJI : Master.Remunerasi.JENIS_INDIKATOR) { double jiBobot = 0.00; double jiHasil = 0.00; for (Map map : data) { if (idUK.equals(map.get("unitKerjaId")) && idSK.equals(map.get("subunitKerjaId")) && idP.equals(map.get("pegawaiId")) && idJ.equals(map.get("jabatanId")) && idJI.equals(map.get("jenisIndikatorId"))) { - String nilai = df.format(Double.valueOf(map.get("realisasi").toString()) - / Double.valueOf(map.get("target").toString())); - String hasil = df.format( - Double.parseDouble(nilai) * Double.valueOf(map.get("bobot").toString())); + String nilai = df.format(Double.parseDouble(map.get("realisasi").toString()) + / Double.parseDouble(map.get("target").toString())); + String hasil = df.format(Double.parseDouble(nilai) + * Double.parseDouble(map.get("bobot").toString())); - jiBobot += Double.valueOf(map.get("bobot").toString()); + jiBobot += Double.parseDouble(map.get("bobot").toString()); jiHasil += Double.parseDouble(hasil); tHasil += Double.parseDouble(hasil); @@ -2866,17 +2781,17 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb && CommonUtil.isNotNullOrEmpty(rsMap.get("pegawaiId")) && CommonUtil.isNotNullOrEmpty(rsMap.get("jabatanId")) && CommonUtil.isNotNullOrEmpty(rsMap.get("nilaiJabatan"))) { - Double iki = 0.00; + double iki = 0.00; String kriteria = ""; if (Arrays.asList(Master.KelompokJabatan.DIR_MS).contains(idKelompokJabatan)) { for (Map aiki : acuanIndeks) { - if ((Double.valueOf(aiki.get("nilaiBawah").toString()) < Double + if ((Double.parseDouble(aiki.get("nilaiBawah").toString()) < Double .parseDouble(df.format(tHasil)) && Double.parseDouble(df.format(tHasil)) <= Double - .valueOf(aiki.get("nilaiAtas").toString())) + .parseDouble(aiki.get("nilaiAtas").toString())) || (Double.parseDouble(df.format(tHasil)) > 1000 - && Double.valueOf(aiki.get("nilaiAtas").toString()) == 1000)) { - iki = Double.valueOf(aiki.get("iki").toString()); + && Double.parseDouble(aiki.get("nilaiAtas").toString()) == 1000)) { + iki = Double.parseDouble(aiki.get("iki").toString()); kriteria = aiki.get("kriteria").toString(); break; @@ -2892,13 +2807,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } for (Map aiki : acuanIndeksLain) { - if ((Double.valueOf(aiki.get("nilaiBawah").toString()) < Double + if ((Double.parseDouble(aiki.get("nilaiBawah").toString()) < Double .parseDouble(df.format(tHasil)) && Double.parseDouble(df.format(tHasil)) <= Double - .valueOf(aiki.get("nilaiAtas").toString())) + .parseDouble(aiki.get("nilaiAtas").toString())) || (Double.parseDouble(df.format(tHasil)) > 160 - && Double.valueOf(aiki.get("nilaiAtas").toString()) == 160)) { - iki = Double.valueOf(aiki.get("iki").toString()); + && Double.parseDouble(aiki.get("nilaiAtas").toString()) == 160)) { + iki = Double.parseDouble(aiki.get("iki").toString()); kriteria = aiki.get("kriteria").toString(); break; @@ -2926,16 +2841,17 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb break; } } - double p1 = Double.valueOf(rd.get("nilaiJabatan").toString()) * Master.Remunerasi.IK_STANDAR - * Double.valueOf(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P1; - 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; + double p1 = Double.parseDouble(rd.get("nilaiJabatan").toString()) * Master.Remunerasi.IKI_STANDAR + * Double.parseDouble(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P1; + double p2 = Double.parseDouble(rd.get("nilaiJabatan").toString()) + * Double.parseDouble(rd.get("iki").toString()) * Master.Remunerasi.IKU + * Double.parseDouble(rd.get("pir").toString()) * Master.Remunerasi.PERSEN_P2; rd.put("p1", p1); rd.put("p2", p2); - rd.put("rpP1", kursINA.format(p1).toString()); - rd.put("rpP2", kursINA.format(p2).toString()); + rd.put("rpP1", kursINA.format(p1)); + rd.put("rpP2", kursINA.format(p2)); result.add(rd); } @@ -2951,8 +2867,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb */ public List hitungSkorDokter(Date bulan, byte typeId) { List result = new ArrayList<>(); - List listDetailJenisProduk = new ArrayList<>(); - List listDetailJenisProdukException = new ArrayList<>(); + List listDetailJenisProduk; + List listDetailJenisProdukException; DateFormat mf = new SimpleDateFormat("yyyy-MM"); @@ -2997,8 +2913,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (mapLayanan.get("pegawaiId").equals(mapSkor.get("pegawaiId")) && mapLayanan.get("produkId").equals(mapSkor.get("produkId")) && (((Date) mapLayanan.get("tglPelayanan")).after((Date) mapSkor.get("tglMulaiBerlaku")) - || ((Date) mapLayanan.get("tglPelayanan")) - .equals((Date) mapSkor.get("tglMulaiBerlaku")))) { + || mapLayanan.get("tglPelayanan").equals(mapSkor.get("tglMulaiBerlaku")))) { mapLayanan.put("skor", mapSkor.get("skor")); break; } @@ -3010,7 +2925,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb // RULES for (Map mapLayanan : dataLayanan) { - if (Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0 + if (Double.parseDouble(mapLayanan.get("hargaDiskon").toString()) > 0.0 && (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon")) || Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) { // tidak_dapat_skor_untuk_diskon_dpjp @@ -3019,20 +2934,25 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } else if (!mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.KONSUL) && !mapLayanan.get("namaProduk").toString().toLowerCase().contains(Master.VISIT) && listRuangEks.contains(mapLayanan.get("ruanganId"))) { - mapLayanan.put("skor", Double.parseDouble(decf.format( - Double.valueOf(mapLayanan.get("skor").toString()) * Master.Remunerasi.PERSEN_SKOR_EKSEKUTIF))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("skor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Master.Remunerasi.PERSEN_SKOR_EKSEKUTIF))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } else if (mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) { - mapLayanan.put("skor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Master.Remunerasi.PERSEN_SKOR_ASISTEN_SPESIALIS))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("skor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Master.Remunerasi.PERSEN_SKOR_ASISTEN_SPESIALIS))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } else { mapLayanan.put("skor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString())))); - mapLayanan.put("tSkor", Double.parseDouble(decf.format(Double.valueOf(mapLayanan.get("skor").toString()) - * Double.valueOf(mapLayanan.get("jumlah").toString())))); + mapLayanan.put("tSkor", + Double.parseDouble(decf.format(Double.parseDouble(mapLayanan.get("skor").toString()) + * Double.parseDouble(mapLayanan.get("jumlah").toString())))); } } @@ -3047,7 +2967,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drLabPAList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI); List drLabPKList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK); List drRadList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI); - + List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); for (Integer idPegawai : listIdPegawai) { SkorDokterVO skorDokterVO = new SkorDokterVO(); @@ -3071,13 +2991,13 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb double capaian = 0.0; for (Map mapLayanan : dataLayanan) { - if (mapLayanan.get("pegawaiId").equals(idPegawai) && (listDetailJenisProduk - .contains(mapLayanan.get("detailJenisProdukId")) - || (!listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId")) - && idsDokterUmumIGD.contains(mapLayanan.get("produkId")) - && drKsmUmumList.contains(mapLayanan.get("pegawaiId")) - && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)))) { - capaian += Double.valueOf(mapLayanan.get("tSkor").toString()); + if (mapLayanan.get("pegawaiId").equals(idPegawai) + && (listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId")) + || (!listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId")) + && idsDokterUmumIGD.contains(mapLayanan.get("produkId")) + && drKsmUmumList.contains(mapLayanan.get("pegawaiId")) + && mapLayanan.get("departemenId").equals(Master.Departemen.IGD)))) { + capaian += Double.parseDouble(mapLayanan.get("tSkor").toString()); } } @@ -3319,9 +3239,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb result.addAll(listRs); } - /** - * Untuk output internal - */ + // Untuk output internal List listIdPegawai = new ArrayList<>(); List listBulan = new ArrayList<>(); for (SkorDokterVO skorDokterVO : result) { @@ -3336,15 +3254,15 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List sortedListBulan = listBulan.stream().sorted().collect(Collectors.toList()); for (Integer idPegawai : sortedListIdPegawai) { - String out = ""; - String skor = ""; + String out; + StringBuilder skor = new StringBuilder(); for (Date bulan : sortedListBulan) { for (SkorDokterVO vo : result) { if (idPegawai.equals(vo.getIdPegawai()) && bulan.equals(vo.getBulan())) { - if (skor == "") { - skor = vo.getSkor().toString(); + if (Objects.equals(skor.toString(), "")) { + skor = new StringBuilder(vo.getSkor().toString()); } else { - skor += "," + vo.getSkor().toString(); + skor.append(",").append(vo.getSkor().toString()); } } } @@ -3361,7 +3279,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List result = new ArrayList<>(); List> data = new ArrayList<>(); - List bulanBerlaku = new ArrayList<>(); + List bulanBerlaku; DateFormat df = new SimpleDateFormat("yyyy-MM"); @@ -3446,8 +3364,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : pelayananPerawat) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor")) && tglPelayanan.equals(df.format((Date) mapLayanan.get("tglPelayanan")))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); data.putAll(mapLayanan); data.put("tglPelayanan", df.format(((Date) mapLayanan.get("tglPelayanan")))); } @@ -3471,8 +3389,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb double jumlahSkor = 0.0; for (Map mapLayanan : dataTglPelayanan) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); Map mapDetail = new HashMap<>(); mapDetail.put("jumlah", mapLayanan.get("jumlah")); @@ -3500,10 +3418,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb @Override public List> findDetailLogbookPerawat(Integer idPegawai, Integer idProduk, String tglPelayanan) { - List> result = pelayananPasienPerawatDao.findPelayananPerawatDetail(idPegawai, idProduk, - tglPelayanan); - - return result; + return pelayananPasienPerawatDao.findPelayananPerawatDetail(idPegawai, idProduk, tglPelayanan); } @Override @@ -3550,8 +3465,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : pelayananNakes) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor")) && tglPelayanan.equals(df.format((Date) mapLayanan.get("tglPelayanan")))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); data.putAll(mapLayanan); data.put("tglPelayanan", df.format(((Date) mapLayanan.get("tglPelayanan")))); } @@ -3575,8 +3490,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb double jumlahSkor = 0.0; for (Map mapLayanan : dataTglPelayanan) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); Map mapDetail = new HashMap<>(); mapDetail.put("jumlah", mapLayanan.get("jumlah")); @@ -3603,13 +3518,10 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb @Override public List> findDetailLogbookNakes(Integer idPegawai, Integer idProduk, String tglPelayanan) { - List> result = new ArrayList<>(); - + List> result; result = pelayananPasienNakesDao.findPelayananNakesDetail(idPegawai, idProduk, tglPelayanan); - if (CommonUtil.isNullOrEmpty(result)) { + if (CommonUtil.isNullOrEmpty(result)) result = pelayananNakesDao.findPelayananNakesDetail(idPegawai, idProduk, tglPelayanan); - } - return result; } @@ -3653,8 +3565,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb for (Map mapLayanan : pelayananFarmakologi) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor")) && tglPelayanan.equals(df.format((Date) mapLayanan.get("tglPelayanan")))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); data.putAll(mapLayanan); data.put("tglPelayanan", df.format(((Date) mapLayanan.get("tglPelayanan")))); } @@ -3678,8 +3590,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb double jumlahSkor = 0.0; for (Map mapLayanan : dataTglPelayanan) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))) { - jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); + jumlahTindakan += Double.parseDouble(mapLayanan.get("jumlah").toString()); + jumlahSkor += Double.parseDouble(mapLayanan.get("tSkor").toString()); Map mapDetail = new HashMap<>(); mapDetail.put("jumlah", mapLayanan.get("jumlah")); @@ -3707,10 +3619,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb @Override public List> findDetailLogbookFarmakologi(Integer idPegawai, Integer idProduk, String tglPelayanan) { - List> result = pelayananFarmakologiDao.findPelayananFarmakologiDetail(idPegawai, idProduk, - tglPelayanan); - return result; + return pelayananFarmakologiDao.findPelayananFarmakologiDetail(idPegawai, idProduk, tglPelayanan); } @Override diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index c98639fb..32ece1fe 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -6,6 +6,7 @@ import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom; import com.jasamedika.medifirst2000.dto.PegawaiDto; import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.paging.Comparison; import com.jasamedika.medifirst2000.paging.Condition; import com.jasamedika.medifirst2000.paging.Filter; @@ -209,26 +210,25 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) public Map getAllPegawai(Integer page, Integer take, String sort, String dir, Integer id, String namaLengkap) { - Filter filter = new Filter(); - if (CommonUtil.isNotNullOrEmpty(id)) { - filter.addCondition( - new Condition.Builder().setComparison(Comparison.eq).setField("id").setValue(id).build()); - } - if (CommonUtil.isNotNullOrEmpty(namaLengkap)) { - filter.addCondition(new Condition.Builder().setComparison(Comparison.eq).setField("namaLengkap") - .setValue(namaLengkap).build()); - } - filter.addCondition(new Condition.Builder().setComparison(Comparison.inn).setField("id").build()); - Pageable pageable = new PageRequest(page, take, Sort.Direction.ASC, sort); - Page resultPage = pegawaiDao.findAll(filter, pageable); - List pegawaiList = resultPage.getContent(); try { + Filter filter = new Filter(); + if (CommonUtil.isNotNullOrEmpty(id)) { + filter.addCondition( + new Condition.Builder().setComparison(Comparison.eq).setField("id").setValue(id).build()); + } + if (CommonUtil.isNotNullOrEmpty(namaLengkap)) { + filter.addCondition(new Condition.Builder().setComparison(Comparison.eq).setField("namaLengkap") + .setValue(namaLengkap).build()); + } + filter.addCondition(new Condition.Builder().setComparison(Comparison.inn).setField("id").build()); + Pageable pageable = new PageRequest(page, take, Sort.Direction.ASC, sort); + Page resultPage = pegawaiDao.findAll(filter, pageable); + List pegawaiList = resultPage.getContent(); return constructMapReturn(JsonUtil.ToMaps(pegawaiList), resultPage.getTotalElements(), resultPage.getTotalPages()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return null; } @Override @@ -273,39 +273,23 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public List> getAllByJenisPegawai(String getSettingDataFixed, String key) { - Map result = new HashMap<>(); - List resultModel = pegawaiDao.findByJenisPetugas(Integer.parseInt(getSettingDataFixed), - "%" + key + "%"); - if (CommonUtil.isNotNullOrEmpty(resultModel)) { - result.put("pegawai", resultModel); - result.put("dataFound", true); - } else { - result.put("dataFound", false); - } try { + List resultModel = pegawaiDao.findByJenisPetugas(Integer.parseInt(getSettingDataFixed), + "%" + key + "%"); return JsonUtil.ToMaps(resultModel, 1); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return null; } @Override public List> getAllBySatuanKerja(Integer satuanKerjaId) { - Map result = new HashMap<>(); - List resultModel = pegawaiDao.findBySatuanKerja(satuanKerjaId); - if (CommonUtil.isNotNullOrEmpty(resultModel)) { - result.put("pegawai", resultModel); - result.put("dataFound", true); - } else { - result.put("dataFound", false); - } try { + List resultModel = pegawaiDao.findBySatuanKerja(satuanKerjaId); return JsonUtil.ToMaps(resultModel, 1); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return null; } @Override @@ -336,7 +320,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ try { items.add(mapJadwal.ToMap()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } } @@ -349,7 +333,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ shiftKerja.put("detail", JsonUtil.ToMaps(shiftKerjaDao.findByKelompokShiftId(idShift))); map.put("pegawai", pegawaiMap); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } list.add(map); } @@ -366,8 +350,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Pegawai dokter = pegawaiDao.findOne(pegawai); try { listPegawai.add(dokter.ToMap()); - } catch (IllegalArgumentException | IllegalAccessException e1) { - e1.printStackTrace(); + } catch (IllegalArgumentException | IllegalAccessException e) { + throw new ServiceVOException(e.getMessage()); } for (Map map : listPegawai) { @@ -379,7 +363,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ try { items.add(mapJadwal.ToMap()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } } @@ -392,7 +376,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ shiftKerja.put("detail", JsonUtil.ToMaps(shiftKerjaDao.findByKelompokShiftId(idShift))); map.put("pegawai", pegawaiMap); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } list.add(map); } @@ -405,9 +389,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ try { return JsonUtil.ToMaps(pegawaiDao.find()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return null; } @SuppressWarnings("unchecked") @@ -420,8 +403,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Pegawai dokter = pegawaiDao.findOne(id); try { listPegawai.add(dokter.ToMap()); - } catch (IllegalArgumentException | IllegalAccessException e1) { - e1.printStackTrace(); + } catch (IllegalArgumentException | IllegalAccessException e) { + throw new ServiceVOException(e.getMessage()); } for (Map map : listPegawai) { @@ -433,7 +416,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ try { items.add(mapJadwal.ToMap()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } } @@ -446,7 +429,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ shiftKerja.put("detail", JsonUtil.ToMaps(shiftKerjaDao.findByKelompokShiftId(idShift))); map.put("pegawai", pegawaiMap); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } list.add(map); } @@ -1108,7 +1091,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ .equalsIgnoreCase("1")) items.add(mapJadwal.ToMap()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } } @@ -1116,7 +1099,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } map.put("jadwal", items); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } else { System.out.println("Lukman debug : bukan dokter "); @@ -1161,14 +1144,14 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ try { items.add(mapPegawaiJadwalKerja.ToMap()); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } } map.put("jadwal", items); } } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } list.add(map); @@ -1308,7 +1291,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } list.add(map); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } result.put("data", list); @@ -1444,7 +1427,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ } list.add(map); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } result.put("data", list); @@ -1483,7 +1466,6 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public String SaveRegistrasiPegawaiMobile(RegistrasiPegawaiMobileVO vo) { - Map result = new HashMap<>(); Pegawai model = new Pegawai(); Negara negara = new Negara(); @@ -1500,14 +1482,11 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ model.setNamaLengkap(vo.getNamaLengkap()); Pegawai resultDomain = pegawaiDao.save(model); - if (CommonUtil.isNotNullOrEmpty(resultDomain)) { + if (CommonUtil.isNotNullOrEmpty(resultDomain)) if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) { resultDomain.setQPegawai(resultDomain.getId().shortValue()); pegawaiDao.save(resultDomain); } - result.put("noRec", resultDomain.getId()); - } - return resultDomain.getId().toString(); } @@ -1523,7 +1502,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ tanggalLahir = df.parse(tglLahir); calendar.setTime(tanggalLahir); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } if (CommonUtil.isNotNullOrEmpty(jabatanFungsional)) { Jabatan jabatan = jabatanDao.findOne(jabatanFungsional); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index df98f650..b939ed62 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -39,7 +39,7 @@ import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.OBAT_ALK import static com.jasamedika.medifirst2000.constants.Master.KONSUL_VISIT; import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR; import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS; -import static com.jasamedika.medifirst2000.constants.Master.LoginUser.TATA_REKENING; +import static com.jasamedika.medifirst2000.constants.Master.KelompokUser.TATA_REKENING; import static com.jasamedika.medifirst2000.constants.Master.Ruangan.*; import static com.jasamedika.medifirst2000.constants.Master.SubUnitKerja.*; import static com.jasamedika.medifirst2000.constants.Master.TipePegawai.PURNA_WAKTU; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java index bbbfc4d0..a7e13119 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java @@ -1,74 +1,29 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.time.DateUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.HabsenDao; -import com.jasamedika.medifirst2000.dao.JatahCutiDanIzinDao; -import com.jasamedika.medifirst2000.dao.KalenderDao; -import com.jasamedika.medifirst2000.dao.KomponenIndexDao; -import com.jasamedika.medifirst2000.dao.ListTanggalCutiDao; -import com.jasamedika.medifirst2000.dao.MapKalenderToHariLiburDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PegawaiHistoriRekapIndexDao; -import com.jasamedika.medifirst2000.dao.PegawaiJadwalKerjaDao; -import com.jasamedika.medifirst2000.dao.PermohonanCutiPegawaiDao; -import com.jasamedika.medifirst2000.dao.PlanningPegawaiStatusDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.SettingDataFixedDao; -import com.jasamedika.medifirst2000.dao.StatusPegawaiDao; -import com.jasamedika.medifirst2000.dao.StrukHistoriDao; -import com.jasamedika.medifirst2000.dao.SuratKeputusanDao; +import com.jasamedika.medifirst2000.dao.*; import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiStatusDaoCustom; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.JatahCutiDanIzin; -import com.jasamedika.medifirst2000.entities.JenisKeputusan; -import com.jasamedika.medifirst2000.entities.KomponenIndex; -import com.jasamedika.medifirst2000.entities.ListTanggalCuti; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex; -import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StatusPegawai; -import com.jasamedika.medifirst2000.entities.StrukHistori; -import com.jasamedika.medifirst2000.entities.SuratKeputusan; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.MonitoringAbsenService; import com.jasamedika.medifirst2000.service.PermohonanStatusPegawaiService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.FactoRateKelompokShiftVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.JatahCutiDanIzinVO; -import com.jasamedika.medifirst2000.vo.JenisKeputusanVO; -import com.jasamedika.medifirst2000.vo.KelompokShiftKerjaCustomVO; -import com.jasamedika.medifirst2000.vo.KomponenIndexVO; -import com.jasamedika.medifirst2000.vo.ListTanggalCutiVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PlanningPegawaiStatusVO; -import com.jasamedika.medifirst2000.vo.StatusPegawaiVO; +import com.jasamedika.medifirst2000.vo.*; +import org.apache.commons.lang.time.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; @Service("PegawaiCutiService") public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiService { @@ -156,7 +111,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi @Override public Map getUserLogin(Integer idPegawai) { - Map result = new HashMap(); + Map result = new HashMap<>(); Map pegawai = pegawaiDao.getPegawaiByIdCustom(idPegawai); Map mapPegawai = mapPegawaiJabatanToUnitKerjaDao.findAllByPegawaiPrimary(idPegawai); if (CommonUtil.isNotNullOrEmpty(pegawai)) { @@ -219,11 +174,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi @Override public Map getDataPermohonanStatus(Integer id) { - Map result = new HashMap<>(); - Map data = planningPegawaiStatusDao.getDataPermohonanStatus(id); - result.put("kategoriPegawaiId", data.get("kategoriPegawaiId")); - - return data; + return planningPegawaiStatusDao.getDataPermohonanStatus(id); } @Override @@ -236,23 +187,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return result; } - @Override - public Integer countSisaCuti(Integer dataCuti, Integer cutiTerpakai, Integer cutiBersama, Boolean isTangguhkan) { - if (dataCuti - difCutiTerpakai(cutiTerpakai, cutiBersama) > 6 && !isTangguhkan) { - return 6; - } else { - return dataCuti - difCutiTerpakai(cutiTerpakai, cutiBersama); - } - } - @Override public Integer difCutiTerpakai(Integer cutiTerpakai, Integer dataCuti) { - Integer difCutiTerpakai = 0; - if (cutiTerpakai > dataCuti) { + int difCutiTerpakai = 0; + if (cutiTerpakai > dataCuti) difCutiTerpakai = cutiTerpakai - dataCuti; - } else { - difCutiTerpakai = 0; - } return difCutiTerpakai; } @@ -262,17 +201,17 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi List listKomponenIndex = new ArrayList<>(); - Integer sisaCuti = 0; + int sisaCuti; Integer sisaCutiB2 = 0; Integer sisaCutiB1 = 0; - Integer sisaCutiB = 0; - Integer sisaCutiN2 = 0; - Integer sisaCutiN1 = 0; - Integer sisaCutiN = 0; + int sisaCutiB; + int sisaCutiN2; + int sisaCutiN1; + int sisaCutiN; Integer jatahCuti = 0; - Integer sisaJatahRawatJalan = 0; - Integer sisaJatahRawatInap = 0; - Integer sisaIzin = 0; + int sisaJatahRawatJalan = 0; + int sisaJatahRawatInap = 0; + int sisaIzin; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -281,12 +220,12 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi year = formatter.format(DateUtil.now()); } - Integer yearn1 = Integer.parseInt(year) - 1; - Integer yearn2 = Integer.parseInt(year) - 2; - Integer yearn3 = Integer.parseInt(year) + 1; - String yearN1 = yearn1.toString(); - String yearN2 = yearn2.toString(); - String yearN3 = yearn3.toString(); + int yearn1 = Integer.parseInt(year) - 1; + int yearn2 = Integer.parseInt(year) - 2; + int yearn3 = Integer.parseInt(year) + 1; + String yearN1 = Integer.toString(yearn1); + String yearN2 = Integer.toString(yearn2); + String yearN3 = Integer.toString(yearn3); if (statusPegawaiId == 5 || statusPegawaiId == 1 || statusPegawaiId == 21) { // ------------------------------------------SETTING_DATA_FIX------------------------------------------ @@ -298,9 +237,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi listKomponenIndex.add(Integer.valueOf(komponenIndeksCutiShift)); // Initiate cuti bersama - Integer cutiTerpakaiB2 = 0; - Integer cutiTerpakaiB1 = 0; - Integer cutiTerpakaiB = 0; + Integer cutiTerpakaiB2; + Integer cutiTerpakaiB1; + Integer cutiTerpakaiB; // Menghitung cuti terpakai tahun n-2 Integer cutiTerpakaiN2 = pegawaiHistoriRekapIndexDao.getCutiTerpakai(yearN2, pegawaiId, listKomponenIndex); if (CommonUtil.isNullOrEmpty(cutiTerpakaiN2)) { @@ -353,8 +292,6 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } } } - } else { - // impossible scenario } // Mendapatkan seluruh data jatah cuti untuk pegawai tertentu @@ -497,35 +434,26 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (CommonUtil.isNotNullOrEmpty(jCutiN)) { result.put("isTangguhkanN", jCutiN); } else { - jCutiN = false; result.put("isTangguhkanN", false); } - // formula menghitung sisa cuti bersama dan mapping if (dataCutiB >= cutiTerpakaiN) { sisaCutiB = dataCutiB - cutiTerpakaiN; cutiTerpakaiB = cutiTerpakaiN; - result.put("sisaCutiB2", sisaCutiB2); - result.put("sisaCutiB1", sisaCutiB1); - result.put("sisaCutiB", sisaCutiB); - result.put("cutiTerpakaiB2", cutiTerpakaiB2); - result.put("cutiTerpakaiB1", cutiTerpakaiB1); - result.put("cutiTerpakaiB", cutiTerpakaiB); - } else { // jika cuti terpakai tahun berjalan lebih besar dari jatah - // cuti bersama + } else { sisaCutiB = 0; cutiTerpakaiB = dataCutiB; - result.put("sisaCutiB2", sisaCutiB2); - result.put("sisaCutiB1", sisaCutiB1); - result.put("sisaCutiB", sisaCutiB); - result.put("cutiTerpakaiB2", cutiTerpakaiB2); - result.put("cutiTerpakaiB1", cutiTerpakaiB1); - result.put("cutiTerpakaiB", cutiTerpakaiB); } + result.put("sisaCutiB2", sisaCutiB2); + result.put("sisaCutiB1", sisaCutiB1); + result.put("sisaCutiB", sisaCutiB); + result.put("cutiTerpakaiB2", cutiTerpakaiB2); + result.put("cutiTerpakaiB1", cutiTerpakaiB1); + result.put("cutiTerpakaiB", cutiTerpakaiB); // menghitung jatah cuti yang terpakai Integer jatahCutiTerpakaiN2 = 0, jatahCutiTerpakaiN1 = 0, jatahCutiTerpakaiN = 0; - Integer allCutiTerpakai = difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + int allCutiTerpakai = difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) + difCutiTerpakai(cutiTerpakaiN, dataCutiB); if (dataCutiN2 > 0) { if (allCutiTerpakai >= dataCutiN2) { @@ -536,62 +464,6 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } else { jatahCutiTerpakaiN2 = dataCutiN2; } - - // menghitung sisa cuti terlebih dahulu - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) - + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) { - sisaCutiN2 = 0; // hangus - } else { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) - + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { - if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { - sisaCutiN2 = 6; - } else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) { - sisaCutiN2 = 0; - } else if (!jCutiN2 && !jCutiN1) { - sisaCutiN2 = 6 - jatahCutiTerpakaiN2; - } else { - sisaCutiN2 = 0; - } - } else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) - + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) { - sisaCutiN2 = 0; - } else { - sisaCutiN2 = dataCutiN2 - jatahCutiTerpakaiN2; - } - } - } else { - if (dataCutiN2 - jatahCutiTerpakaiN2 >= 6 && !jCutiN2) { - sisaCutiN2 = 6 - jatahCutiTerpakaiN2; - } else { - sisaCutiN2 = dataCutiN2 - jatahCutiTerpakaiN2; - } - } - // hitung ulang jatah cuti terpakai karena pengajuan cuti - // tahun n menggunakan sisa n-2 - if (sisaCutiN2 > 0 && difCutiTerpakai(cutiTerpakaiN, dataCutiB) > 0) { - if (sisaCutiN2 > difCutiTerpakai(cutiTerpakaiN, dataCutiB)) { - jatahCutiTerpakaiN2 += difCutiTerpakai(cutiTerpakaiN, dataCutiB); - } else { - jatahCutiTerpakaiN2 += sisaCutiN2; - } - } - - allCutiTerpakai = allCutiTerpakai - jatahCutiTerpakaiN2; - if (allCutiTerpakai > 0) { - if (allCutiTerpakai >= dataCutiN1) { - jatahCutiTerpakaiN1 = dataCutiN1; - allCutiTerpakai = allCutiTerpakai - jatahCutiTerpakaiN1; - if ((allCutiTerpakai > 0) && (allCutiTerpakai <= dataCutiN)) { - jatahCutiTerpakaiN = allCutiTerpakai; - } else { - jatahCutiTerpakaiN = 0; - } - } else { - jatahCutiTerpakaiN1 = allCutiTerpakai; - } - } } else { if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { @@ -600,61 +472,54 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } else { jatahCutiTerpakaiN2 = allCutiTerpakai; } - - // menghitung sisa cuti terlebih dahulu - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) - + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) { - sisaCutiN2 = 0; // hangus - } else { - if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) - + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 > 0) { - if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { - sisaCutiN2 = 6; - } else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) { - sisaCutiN2 = 0; - } else if (!jCutiN2 && !jCutiN1) { - sisaCutiN2 = 6 - jatahCutiTerpakaiN2; - } else { - sisaCutiN2 = 0; - } - } else if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) - + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6 && dataCutiN2 <= 0) { - sisaCutiN2 = 0; - } else { - sisaCutiN2 = dataCutiN2 - jatahCutiTerpakaiN2; - } - } + } + if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 12) { + if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) > 0) { + sisaCutiN2 = 0; // hangus } else { - if (dataCutiN2 - jatahCutiTerpakaiN2 >= 6 && !jCutiN2) { - sisaCutiN2 = 6 - jatahCutiTerpakaiN2; + if (difCutiTerpakai(cutiTerpakaiN2, dataCutiB2) + + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1) < 6) { + if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { + sisaCutiN2 = 6; + } else if (jatahCutiTerpakaiN2 == 0) { + sisaCutiN2 = 0; + } else if (!jCutiN2 && !jCutiN1) { + sisaCutiN2 = 6 - jatahCutiTerpakaiN2; + } else { + sisaCutiN2 = 0; + } } else { + difCutiTerpakai(cutiTerpakaiN2, dataCutiB2); + difCutiTerpakai(cutiTerpakaiN1, dataCutiB1); sisaCutiN2 = dataCutiN2 - jatahCutiTerpakaiN2; } } - // hitung ulang jatah cuti terpakai karena pengajuan cuti - // tahun n menggunakan sisa n-2 - if (sisaCutiN2 > 0 && difCutiTerpakai(cutiTerpakaiN, dataCutiB) > 0) { - if (sisaCutiN2 > difCutiTerpakai(cutiTerpakaiN, dataCutiB)) { - jatahCutiTerpakaiN2 += difCutiTerpakai(cutiTerpakaiN, dataCutiB); - } else { - jatahCutiTerpakaiN2 += sisaCutiN2; - } + } else { + if (dataCutiN2 - jatahCutiTerpakaiN2 >= 6 && !jCutiN2) { + sisaCutiN2 = 6 - jatahCutiTerpakaiN2; + } else { + sisaCutiN2 = dataCutiN2 - jatahCutiTerpakaiN2; } - - allCutiTerpakai = allCutiTerpakai - jatahCutiTerpakaiN2; - if (allCutiTerpakai > 0) { - if (allCutiTerpakai >= dataCutiN1) { - jatahCutiTerpakaiN1 = dataCutiN1; - allCutiTerpakai = allCutiTerpakai - jatahCutiTerpakaiN1; - if ((allCutiTerpakai > 0) && (allCutiTerpakai <= dataCutiN)) { - jatahCutiTerpakaiN = allCutiTerpakai; - } else { - jatahCutiTerpakaiN = 0; - } + } + if (sisaCutiN2 > 0 && difCutiTerpakai(cutiTerpakaiN, dataCutiB) > 0) { + if (sisaCutiN2 > difCutiTerpakai(cutiTerpakaiN, dataCutiB)) { + jatahCutiTerpakaiN2 += difCutiTerpakai(cutiTerpakaiN, dataCutiB); + } else { + jatahCutiTerpakaiN2 += sisaCutiN2; + } + } + allCutiTerpakai = allCutiTerpakai - jatahCutiTerpakaiN2; + if (allCutiTerpakai > 0) { + if (allCutiTerpakai >= dataCutiN1) { + jatahCutiTerpakaiN1 = dataCutiN1; + allCutiTerpakai = allCutiTerpakai - jatahCutiTerpakaiN1; + if ((allCutiTerpakai > 0) && (allCutiTerpakai <= dataCutiN)) { + jatahCutiTerpakaiN = allCutiTerpakai; } else { - jatahCutiTerpakaiN1 = allCutiTerpakai; + jatahCutiTerpakaiN = 0; } + } else { + jatahCutiTerpakaiN1 = allCutiTerpakai; } } } else if (dataCutiN1 > 0) { @@ -700,7 +565,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (cutiTerpakaiN3 > sisaCutiN1) { jatahCutiTerpakaiN1 += sisaCutiN1; cutiTerpakaiN3 -= sisaCutiN1; - if (cutiTerpakaiN3 > 0 && sisaCutiN > 0) { + if (sisaCutiN > 0) { if (cutiTerpakaiN3 > sisaCutiN) { jatahCutiTerpakaiN += sisaCutiN; } else { @@ -742,7 +607,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi && dataCutiN2 > 0) { if (jatahCutiTerpakaiN2 == 0 && !jCutiN1) { sisaCutiN2 = 6; - } else if (jatahCutiTerpakaiN2 == 0 && jCutiN1) { + } else if (jatahCutiTerpakaiN2 == 0) { sisaCutiN2 = 0; } else if (!jCutiN2 && !jCutiN1) { sisaCutiN2 = 6 - jatahCutiTerpakaiN2; @@ -893,7 +758,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat y = new SimpleDateFormat("yyyy"); - int listTglSize = 0; + int listTglSize; for (ListTanggalCutiVO vo : listTanggalCutiVO) { if (!listTahunPengajuanCuti.contains(y.format(vo.getTgl()))) { @@ -958,100 +823,19 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } listTgl.clear(); listTgl.addAll(listTglDetail); - listTglSize = listTgl.size(); - } else { - listTglSize = listTgl.size(); } } else { for (ListTanggalCutiVO vo : listTanggalCutiVO) { listTgl.add(vo.getTgl()); } - listTglSize = listTgl.size(); } + listTglSize = listTgl.size(); if (CommonUtil.isNotNullOrEmpty(listTanggalSudahDiajukan)) { listTgl.removeAll(listTanggalSudahDiajukan); - if (listTgl.size() != listTglSize) { - return false; // tidak bisa cuti - } else { - return true; // bisa cuti - } - } else { - return true; // bisa cuti - } - } - - @Override - public boolean validateTanggalPermohonan(Integer statusPegawaiPlanId, Set listTanggalCutiVO, - Integer idPegawai) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List listNorecPlanning = permohonanCutiPegawaiDao.getAllNorecPlanning(idPegawai); - if (CommonUtil.isNotNullOrEmpty(listNorecPlanning)) { - List listTgl = new ArrayList<>(); - List listTanggalSudahDiajukan = new ArrayList<>(); - if (Arrays.asList(Master.StatusPegawai.PERIODIK_PENGAJUAN_KETIDAKHADIRAN).contains(statusPegawaiPlanId)) { - int listTglSize = 0; - for (ListTanggalCutiVO vo : listTanggalCutiVO) { - listTgl.add(vo.getTgl()); - } - Collections.sort(listTgl); - List listTglAdjust = new ArrayList<>(); - if (listTgl.size() == 2) { - listTgl = kalenderDao.getDateFromPeriodicParameter(sdf.format(listTgl.get(0)), - sdf.format(listTgl.get(1))); - for (Date tgl : listTgl) { - Date dateAdjust = DateUtils.addHours(tgl, 7); - listTglAdjust.add(dateAdjust); - } - listTgl.clear(); - listTgl.addAll(listTglAdjust); - listTglSize = listTgl.size(); - } else { - listTglSize = listTgl.size(); - } - List listAllTanggalCutiApproved = planningPegawaiStatusDao - .getListAllTanggalCutiApproved(listNorecPlanning, listTgl); - List listAllTanggalCutiNotYetApprove = planningPegawaiStatusDao - .getListAllTanggalCutiNotYetApprove(listNorecPlanning, listTgl); - if (CommonUtil.isNotNullOrEmpty(listAllTanggalCutiApproved)) { - listTanggalSudahDiajukan.addAll(listAllTanggalCutiApproved); - } - if (CommonUtil.isNotNullOrEmpty(listAllTanggalCutiNotYetApprove)) { - listTanggalSudahDiajukan.addAll(listAllTanggalCutiNotYetApprove); - } - if (CommonUtil.isNotNullOrEmpty(listTanggalSudahDiajukan)) { - listTgl.removeAll(listTanggalSudahDiajukan); - if (listTgl.size() != listTglSize) { - return false; // tidak bisa cuti - } else { - return true; // bisa cuti - } - } else { - return true; // bisa cuti - } - } else { - for (ListTanggalCutiVO vo : listTanggalCutiVO) { - listTgl.add(vo.getTgl()); - } - if (CommonUtil.isNotNullOrEmpty( - planningPegawaiStatusDao.getListAllTanggalCutiApproved(listNorecPlanning, listTgl))) { - listTanggalSudahDiajukan = planningPegawaiStatusDao.getListAllTanggalCutiApproved(listNorecPlanning, - listTgl); - } - if (CommonUtil.isNotNullOrEmpty( - planningPegawaiStatusDao.getListAllTanggalCutiNotYetApprove(listNorecPlanning, listTgl))) { - listTanggalSudahDiajukan.addAll( - planningPegawaiStatusDao.getListAllTanggalCutiNotYetApprove(listNorecPlanning, listTgl)); - } - if (CommonUtil.isNotNullOrEmpty(listTanggalSudahDiajukan)) { - return false; // tidak bisa cuti - } else { - return true; // bisa cuti - } - } - } else { - return true; // bisa cuti + return listTgl.size() == listTglSize; } + return true; } @Override @@ -1116,66 +900,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (CommonUtil.isNotNullOrEmpty(listTanggalSudahDiajukan)) { listTgl.removeAll(listTanggalSudahDiajukan); - if (listTgl.size() != listTglSize) { - return false; // tidak bisa cuti - } else { - return true; // bisa cuti - } - } else { - return true; // bisa cuti + return listTgl.size() == listTglSize; } - } - - @Override - public boolean validateTanggalPermohonan(Integer statusPegawaiPlanId, List listTgl, Integer idPegawai) { - List listNorecPlanning = permohonanCutiPegawaiDao.getAllNorecPlanning(idPegawai); - if (CommonUtil.isNotNullOrEmpty(listNorecPlanning) && CommonUtil.isNotNullOrEmpty(listTgl)) { - List listTanggalSudahDiajukan = new ArrayList<>(); - int listTglSize = listTgl.size(); - if (CommonUtil.isNotNullOrEmpty( - planningPegawaiStatusDao.getListAllTanggalCutiApproved(listNorecPlanning, listTgl))) { - listTanggalSudahDiajukan = planningPegawaiStatusDao.getListAllTanggalCutiApproved(listNorecPlanning, - listTgl); - } - if (CommonUtil.isNotNullOrEmpty( - planningPegawaiStatusDao.getListAllTanggalCutiNotYetApprove(listNorecPlanning, listTgl))) { - listTanggalSudahDiajukan.addAll( - planningPegawaiStatusDao.getListAllTanggalCutiNotYetApprove(listNorecPlanning, listTgl)); - } - if (Arrays.asList(Master.StatusPegawai.PERIODIK_PENGAJUAN_KETIDAKHADIRAN).contains(statusPegawaiPlanId)) { - if (CommonUtil.isNotNullOrEmpty(listTanggalSudahDiajukan)) { - listTgl.removeAll(listTanggalSudahDiajukan); - if (listTgl.size() != listTglSize) { - return false; // tidak bisa cuti - } else { - return true; // bisa cuti - } - } else { - return true; // bisa cuti - } - } else { - if (CommonUtil.isNotNullOrEmpty(listTanggalSudahDiajukan)) { - return false; // tidak bisa cuti - } else { - return true; // bisa cuti - } - } - } else { - return true; // bisa cuti - } - } - - @Override - public Map checkPermohonanStatusPegawai(String norec) { - Map result = new HashMap<>(); - - PlanningPegawaiStatus model = planningPegawaiStatusDao.findOne(norec); - if (CommonUtil.isNotNullOrEmpty(model.getNoRec())) { - result.put("norec", "true"); - } else { - result.put("norec", "false"); - } - return result; + return true; } @Override @@ -1208,7 +935,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi .setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai())); } - Set listTanggal = new HashSet(); + Set listTanggal = new HashSet<>(); for (ListTanggalCutiVO date : vo.getListTanggal()) { day++; ListTanggalCuti tanggal = listTanggalConverter.transferVOToModel(date, new ListTanggalCuti()); @@ -1263,8 +990,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return null; } } catch (Exception e) { - e.printStackTrace(); - return null; + throw new ServiceVOException(e.getMessage()); } } @@ -1319,14 +1045,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi statusTanggalPermohonan = validateTanggalPermohonanRev(listTglCuti, vo.getPegawai().getId()); } if (CommonUtil.isNotNullOrEmpty(statusTanggalPermohonan) && !statusTanggalPermohonan) { - result.put("bisaCuti", statusTanggalPermohonan); - result.put("status", "Tanggal Permohonan sudah pernah diajukan!"); // Validasi - // tanggal - // permohonan - // yang - // sudah - // diajukan - return result; + result.put("bisaCuti", false); + // Validasi tanggal permohonan yang sudah diajukan + result.put("status", "Tanggal Permohonan sudah pernah diajukan!"); } else { Integer day = 0; if (CommonUtil.isNotNullOrEmpty(vo) && CommonUtil.isNotNullOrEmpty(vo.getNoRec())) { @@ -1348,9 +1069,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi planningPegawaiStatus .setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai())); } - Set listTanggal = new HashSet(); + Set listTanggal = new HashSet<>(); - listTanggalCutiDao.deleteDatas(vo.getNoRec().toString()); + listTanggalCutiDao.deleteDatas(vo.getNoRec()); // listTanggalCutiDao.delete(vo.getNoRec()); for (ListTanggalCutiVO date : vo.getListTanggal()) { day++; @@ -1404,8 +1125,8 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } - return result; } + return result; } @Override @@ -1457,7 +1178,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi List listNorec = new ArrayList<>(); List listTglPengajuan = new ArrayList<>(); - Integer currentYear = Calendar.getInstance().get(Calendar.YEAR); + int currentYear = Calendar.getInstance().get(Calendar.YEAR); List pegawaiSdmKesejahteraan = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM, Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN); @@ -1465,13 +1186,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi Master.SubUnitKerja.SUBBAG_PENGEMBANGAN); List> listData = planningPegawaiStatusDao.getApprovalStatus(idPegawai, - currentYear.toString(), Master.PengajuanCuti.DITANGGUHKAN, Master.PengajuanCuti.BELUM_DISETUJUI, + Integer.toString(currentYear), Master.PengajuanCuti.DITANGGUHKAN, Master.PengajuanCuti.BELUM_DISETUJUI, Arrays.asList(Master.StatusPegawai.KETIDAKHADIRAN)); - // List> listData = - // planningPegawaiStatusDaoCustom.getApprovalStatus(idPegawai); if (pegawaiSdmKesejahteraan.contains(idPegawai)) { - // List> listDataCutiAlasanPentingDanSakit = - // planningPegawaiStatusDaoCustom.getApprovalStatusCutiAlasanPentingDanSakit(); List> listDataCutiAlasanPentingDanSakit = planningPegawaiStatusDao.getApprovalStatusSdm( Master.PengajuanCuti.BELUM_DISETUJUI, Arrays.asList(Master.StatusPegawai.SAKIT_ALASAN_PENTING)); listData.addAll(listDataCutiAlasanPentingDanSakit); @@ -1491,7 +1208,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } // Collections.sort(listNorec, Collections.reverseOrder()); - Collections.sort(listTglPengajuan, Collections.reverseOrder()); + listTglPengajuan.sort(Collections.reverseOrder()); for (String norec : listNorec) { for (Date tglPengajuan : listTglPengajuan) { @@ -1501,25 +1218,23 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi List> listTanggalCutiApproved = new ArrayList<>(); for (Map map : listData) { if (CommonUtil.isNotNullOrEmpty(map.get("approvalStatusTgl"))) { - if (norec.equals(map.get("noRec").toString()) - && tglPengajuan.equals((Date) map.get("tglPengajuan")) + if (norec.equals(map.get("noRec").toString()) && tglPengajuan.equals(map.get("tglPengajuan")) && Boolean.parseBoolean(map.get("approvalStatusTgl").toString())) { count += 1; Map mapTglCutiApproved = new HashMap<>(); mapTglCutiApproved.put("noRec", map.get("norecTgl").toString()); - mapTglCutiApproved.put("tgl", (Date) map.get("tgl")); + mapTglCutiApproved.put("tgl", map.get("tgl")); listTanggalCutiApproved.add(mapTglCutiApproved); if (count == 1) { rawData.putAll(map); } } - if (norec.equals(map.get("noRec").toString()) - && tglPengajuan.equals((Date) map.get("tglPengajuan"))) { + if (norec.equals(map.get("noRec").toString()) && tglPengajuan.equals(map.get("tglPengajuan"))) { count += 1; Map mapTglCuti = new HashMap<>(); mapTglCuti.put("noRec", map.get("norecTgl").toString()); - mapTglCuti.put("tgl", (Date) map.get("tgl")); + mapTglCuti.put("tgl", map.get("tgl")); listTanggalCuti.add(mapTglCuti); if (count == 1) { @@ -1527,12 +1242,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } } } else { - if (norec.equals(map.get("noRec").toString()) - && tglPengajuan.equals((Date) map.get("tglPengajuan"))) { + if (norec.equals(map.get("noRec").toString()) && tglPengajuan.equals(map.get("tglPengajuan"))) { count += 1; Map mapTglCuti = new HashMap<>(); mapTglCuti.put("noRec", map.get("norecTgl").toString()); - mapTglCuti.put("tgl", (Date) map.get("tgl")); + mapTglCuti.put("tgl", map.get("tgl")); listTanggalCuti.add(mapTglCuti); if (count == 1) { @@ -1553,20 +1267,6 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi result.put("listData", listRawData); } - // if (CommonUtil.isNotNullOrEmpty(listData)) { - // for (Map map : listData) { - // List> listTanggalCuti = - // planningPegawaiStatusDao.getListTanggalCuti((String) - // map.get("noRec")); - // List> listTanggalCutiApproved = - // planningPegawaiStatusDao.getListTanggalCutiApproved((String) - // map.get("noRec")); - // map.put("lisTanggal", listTanggalCuti); - // map.put("listTanggalCutiDisetujui", listTanggalCutiApproved); - // } - // result.put("listData", listData); - // } - return result; } @@ -1613,11 +1313,8 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi int pageRequested = page; - if (totalRow > 0) { + if (totalRow > 0) totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } if (pageRequested > totalPages) pageRequested = totalPages; @@ -1660,11 +1357,8 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi int totalPages = 0; int pageRequested = page; - if (totalRow > 0) { + if (totalRow > 0) totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } if (pageRequested > totalPages) pageRequested = totalPages; @@ -1762,8 +1456,8 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (CommonUtil.isNotNullOrEmpty(vo.getTglKeputusan())) { planningPegawaiStatus.setTglKeputusan(vo.getTglKeputusan()); } - Set listTanggal = new HashSet(); - List listTgl = new ArrayList(); + Set listTanggal = new HashSet<>(); + List listTgl = new ArrayList<>(); StatusPegawai statusPegawai = statusPegawaiDao.getAll(vo.getStatusPegawaiExec().getId()); for (ListTanggalCutiVO date : vo.getListTanggal()) { day++; @@ -1792,12 +1486,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi df.format(tglAkhir), df.format(tglAwal)); } - planningPegawaiStatus.setJumlahHari(day); - vo.setJumlahHari(day); - } else { - planningPegawaiStatus.setJumlahHari(day); - vo.setJumlahHari(day); } + planningPegawaiStatus.setJumlahHari(day); + vo.setJumlahHari(day); // planningPegawaiStatus.setListTanggal(listTanggal); planningPegawaiStatus.getListTanggal().clear(); planningPegawaiStatus.getListTanggal().addAll(listTanggal); @@ -1806,7 +1497,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi PlanningPegawaiStatus planningPegawaiStatusResult = planningPegawaiStatusDao .save(planningPegawaiStatus); if (CommonUtil.isNotNullOrEmpty(planningPegawaiStatusResult.noRec)) { - result = checkKelompokShiftKerja(vo, (Integer) planningPegawaiStatus.getStatusPegawaiPlan().getId(), + result = checkKelompokShiftKerja(vo, planningPegawaiStatus.getStatusPegawaiPlan().getId(), planningPegawaiStatusResult.getNoRec()); } } @@ -1814,18 +1505,18 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return result; } - @Transactional(readOnly = false) + @Transactional public String getRunningNumber(String kegunaan) { RunningNumber runningNumber = runningNumberDao.findByResetAndKegunaan("0", kegunaan); - Integer number = (runningNumber.getNomerTerbaru() + (Integer) 1); + int number = (runningNumber.getNomerTerbaru() + (Integer) 1); runningNumber.setNomerTerbaru(runningNumber.getNomerTerbaru() + (Integer) 1); - String noOrderIntern = StringUtil.formatNumber(number.toString(), 6); + String noOrderIntern = StringUtil.formatNumber(Integer.toString(number), 6); runningNumberDao.save(runningNumber); return noOrderIntern; } @Override - @Transactional(readOnly = false) + @Transactional public Map checkKelompokShiftKerja(PlanningPegawaiStatusVO vo, Integer statusPegawaiId, String noRecPlanning) { Map result = new HashMap<>(); @@ -1862,19 +1553,15 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi // ------------------------------------------SETTING DATA // FIX------------------------------------------ if (statusPegawaiId == 1) { - if ((Integer) kelompokShift.get("id") == idNonShift - || (Integer) kelompokShift.get("id") == idnonShiftPlus) { + if (kelompokShift.get("id") == idNonShift || kelompokShift.get("id") == idnonShiftPlus) { kelomokIndexId = komponenCuti; - } else if ((Integer) kelompokShift.get("id") == idShift2 - || (Integer) kelompokShift.get("id") == idShift3) { + } else if (kelompokShift.get("id") == idShift2 || kelompokShift.get("id") == idShift3) { kelomokIndexId = komponenCutiShift; } } else if (statusPegawaiId == 24 || statusPegawaiId == 25 || statusPegawaiId == 26) { - if ((Integer) kelompokShift.get("id") == idNonShift - || (Integer) kelompokShift.get("id") == idnonShiftPlus) { + if (kelompokShift.get("id") == idNonShift || kelompokShift.get("id") == idnonShiftPlus) { kelomokIndexId = 9; - } else if ((Integer) kelompokShift.get("id") == idShift2 - || (Integer) kelompokShift.get("id") == idShift3) { + } else if (kelompokShift.get("id") == idShift2 || kelompokShift.get("id") == idShift3) { kelomokIndexId = 10; } } else if (statusPegawaiId == 28) { @@ -1882,11 +1569,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } else if (statusPegawaiId == 27) { kelomokIndexId = 17; } else if (statusPegawaiId == 29) { - if ((Integer) kelompokShift.get("id") == idNonShift - || (Integer) kelompokShift.get("id") == idnonShiftPlus) { + if (kelompokShift.get("id") == idNonShift || kelompokShift.get("id") == idnonShiftPlus) { kelomokIndexId = 7; - } else if ((Integer) kelompokShift.get("id") == idShift2 - || (Integer) kelompokShift.get("id") == idShift3) { + } else if (kelompokShift.get("id") == idShift2 || kelompokShift.get("id") == idShift3) { kelomokIndexId = 8; } } @@ -1920,7 +1605,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi Integer day = vo.getJumlahHari(); String operatorFactorRate = (String) komponenIndexMap.get("operatorFactorRate"); - Float nilaiIndexTotal = null; + float nilaiIndexTotal = 0; if (operatorFactorRate.equalsIgnoreCase("X")) { nilaiIndexTotal = (day.floatValue()) * factorRate; } else if (operatorFactorRate.equalsIgnoreCase("/")) { @@ -1929,10 +1614,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi nilaiIndexTotal = (day.floatValue()) + factorRate; } if (CommonUtil.isNotNullOrEmpty(day)) { - pegawaiHistoriRekapIndex.setNilaiIndex(day.intValue()); + pegawaiHistoriRekapIndex.setNilaiIndex(day); } if (CommonUtil.isNotNullOrEmpty(nilaiIndexTotal)) { - pegawaiHistoriRekapIndex.setNilaiIndexTotal(nilaiIndexTotal.doubleValue()); + pegawaiHistoriRekapIndex.setNilaiIndexTotal((double) nilaiIndexTotal); } } @@ -1950,20 +1635,6 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return result; } - public Integer getDayJadwalHadir(String settingFixed, Integer pegawaiId, String startDate, String endDate) { - Integer day = 0; - String idKomponenIndexHadir = settingDataFixedDao.getSettingDataFixed(settingFixed); - if (CommonUtil.isNotNullOrEmpty(idKomponenIndexHadir)) { - String[] arr = idKomponenIndexHadir.split(","); - List listId = new ArrayList(); - for (String id : arr) { - listId.add(Integer.valueOf(id)); - } - day = planningPegawaiStatusDao.getDayHadir(pegawaiId, listId, startDate, endDate); - } - return day; - } - @Override public Map unVerifPermohonanStatus(PlanningPegawaiStatusVO vo) { Map result = new HashMap<>(); @@ -1996,79 +1667,12 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return result; } - @Override - public Map getListPermohonanStatusPegawaiPaging(Integer page, Integer limit, String sort, - String dir, Integer idPegawai, String nama, String jenisPermohonan, Integer statusPermohonan, - Boolean isSdm) { - Map result = new HashMap<>(); - List> listData = new ArrayList<>(); - // Pegawai pegawai = loginUserService.getLoginUser().getPegawai(); - - int totalPages = 0; - if (isSdm) { - Long totalRow = planningPegawaiStatusDaoCustom.countPermohonanStatusAll(sort, idPegawai, nama, - jenisPermohonan, statusPermohonan); - - int pageRequested = page; - - if (totalRow > 0) { - totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } - - if (pageRequested > totalPages) - pageRequested = totalPages; - int rowStart = pageRequested * limit - limit; - if (rowStart < 0) { - rowStart = 0; - } - int rowEnd = limit; - - listData = planningPegawaiStatusDaoCustom.getListPermohonanStatusAll(rowStart, rowEnd, sort, dir, idPegawai, - nama, jenisPermohonan, statusPermohonan); - } else { - Long totalRow = planningPegawaiStatusDaoCustom.countApprovedStatus(sort, idPegawai, nama, jenisPermohonan, - statusPermohonan); - - int pageRequested = page; - - if (totalRow > 0) { - totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } - - if (pageRequested > totalPages) - pageRequested = totalPages; - int rowStart = pageRequested * limit - limit; - if (rowStart < 0) { - rowStart = 0; - } - int rowEnd = limit; - - listData = planningPegawaiStatusDaoCustom.getListPermohonanDisetujuiByPegawai(rowStart, rowEnd, sort, dir, - idPegawai, nama, jenisPermohonan, statusPermohonan); - } - - if (CommonUtil.isNotNullOrEmpty(listData)) { - for (Map map : listData) { - List> listTanggalCuti = planningPegawaiStatusDao - .getListTanggalCutiApproved((String) map.get("noRec")); - map.put("lisTanggal", listTanggalCuti); - } - result.put("listData", listData); - result.put("totalPages", totalPages); - } - return result; - } - @Override public Map getListPermohonanStatusPegawaiPaging(Integer page, Integer limit, String sort, String dir, Integer idPegawai, String nama, String jenisPermohonan, Integer statusPermohonan, String tglPermohonan, Boolean isSdm, Boolean isCutiLuarNegeri, Boolean isCutiLuarKota) { Map result = new HashMap<>(); - List> listData = new ArrayList<>(); + List> listData; // Pegawai pegawai = loginUserService.getLoginUser().getPegawai(); int totalPages = 0; @@ -2081,11 +1685,8 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } int pageRequested = page; - if (totalRow > 0) { + if (totalRow > 0) totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } if (pageRequested > totalPages) pageRequested = totalPages; @@ -2106,11 +1707,8 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi } int pageRequested = page; - if (totalRow > 0) { + if (totalRow > 0) totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } if (pageRequested > totalPages) pageRequested = totalPages; @@ -2153,7 +1751,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi // approval status false untuk setiap tanggal yang // di-ceklist - Set listTanggal = new HashSet(); + Set listTanggal = new HashSet<>(); for (ListTanggalCutiVO date : vo.getListTanggal()) { ListTanggalCuti tanggal = listTanggalCutiDao.findOne(date.getNoRec()); ListTanggalCuti tgl = new ListTanggalCuti(); @@ -2182,7 +1780,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi planningPegawaiStatusDitangguhkan.setTglPengajuan(planningPegawaiStatus.getTglPengajuan()); planningPegawaiStatusDitangguhkan.setTglKeputusan(new Date()); planningPegawaiStatusDitangguhkan.setApprovalStatus(3);// ditangguhkan - Set listTanggal = new HashSet(); + Set listTanggal = new HashSet<>(); int day = 0; for (ListTanggalCutiVO date : vo.getListTanggal()) { day++; @@ -2199,7 +1797,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi planningPegawaiStatusDitangguhkan.getListTanggal().clear(); // planningPegawaiStatusDitangguhkan.setListTanggal(listTanggal); planningPegawaiStatusDitangguhkan.getListTanggal().addAll(listTanggal); - Double selisih = 0.0; + double selisih; if (CommonUtil.isNotNullOrEmpty(historiRekap.getNilaiIndex()) && CommonUtil.isNotNullOrEmpty(historiRekap.getNilaiIndexTotal())) { selisih = historiRekap.getNilaiIndexTotal() / historiRekap.getNilaiIndex().doubleValue(); @@ -2222,94 +1820,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi return result; } - @Override - public Map savePlanningPegawaiStatusRev(PlanningPegawaiStatusVO vo) { - Map result = new HashMap<>(); - PlanningPegawaiStatus planningPegawaiStatus = new PlanningPegawaiStatus(); - List listTgl = new ArrayList<>(); - - if (CommonUtil.isNotNullOrEmpty(vo)) { - planningPegawaiStatus = planningPegawaiStatusConverter.transferVOToModel(vo, new PlanningPegawaiStatus()); - } - Integer day = 0; - String noPlanning = noUsulan().get("noUsulan").toString(); - - planningPegawaiStatus.setNoPlanning(noPlanning); - planningPegawaiStatus.setStatusEnabled(true); - planningPegawaiStatus.setApprovalStatus(0); - - if (CommonUtil.isNotNullOrEmpty(vo.getStatusPegawaiPlan())) { - planningPegawaiStatus.setStatusPegawaiPlan( - statusPegawaiConverter.transferVOToModel(vo.getStatusPegawaiPlan(), new StatusPegawai())); - } - if (CommonUtil.isNotNullOrEmpty(vo.getJabatanPemberiNotaDinas())) { - planningPegawaiStatus.setJabatanPemberiNotaDinas( - jabatanConverter.transferVOToModel(vo.getJabatanPemberiNotaDinas(), new Jabatan())); - } - if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { - planningPegawaiStatus.setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai())); - } - - Set listTanggal = new HashSet(); - if (CommonUtil.isNotNullOrEmpty(vo.getListTanggal())) { - for (ListTanggalCutiVO date : vo.getListTanggal()) { - day++; - ListTanggalCuti tanggal = listTanggalConverter.transferVOToModel(date, new ListTanggalCuti()); - tanggal.setPlanningPegawaiStatus(planningPegawaiStatus); - tanggal.setStatusEnabled(true); - if (CommonUtil.isNotNullOrEmpty(tanggal)) { - listTanggal.add(tanggal); - } - } - } - planningPegawaiStatus.setJumlahHari(day); - if (CommonUtil.isNotNullOrEmpty(listTanggal)) { - planningPegawaiStatus.setListTanggal(listTanggal); - } - - if (CommonUtil.isNotNullOrEmpty(vo.getDeskripsiStatusPegawaiPlan())) { - planningPegawaiStatus.setDeskripsiStatusPegawaiPlan(vo.getDeskripsiStatusPegawaiPlan()); - } - if (CommonUtil.isNotNullOrEmpty(vo.getKeteranganLainyaPlan())) { - planningPegawaiStatus.setKeteranganLainyaPlan(vo.getKeteranganLainyaPlan()); - } - - planningPegawaiStatus.setAlamatCuti(vo.getAlamatCuti()); - planningPegawaiStatus.setNomorTelepon(vo.getNomorTelepon()); - planningPegawaiStatus.setIsCutiLuarNegeri(vo.getIsCutiLuarNegeri()); - planningPegawaiStatus.setIsCutiLuarKota(vo.getIsCutiLuarKota()); - - if (CommonUtil.isNotNullOrEmpty(vo.getAlamatTugas())) { - planningPegawaiStatus.setAlamatTugas(vo.getAlamatTugas()); - } - if (CommonUtil.isNotNullOrEmpty(vo.getNoSuratTugas())) { - planningPegawaiStatus.setNoSuratTugas(vo.getNoSuratTugas()); - } - if (CommonUtil.isNotNullOrEmpty(vo.getNoNotaDinas())) { - planningPegawaiStatus.setNoNotaDinas(vo.getNoNotaDinas()); - } - if (CommonUtil.isNotNullOrEmpty(vo.getTglNotaDinas())) { - planningPegawaiStatus.setTglNotaDinas(vo.getTglNotaDinas()); - } - if (CommonUtil.isNotNullOrEmpty(vo.getJenisPerawatan())) { - planningPegawaiStatus.setJenisPerawatan(vo.getJenisPerawatan()); - } - - PlanningPegawaiStatus model = planningPegawaiStatusDao.save(planningPegawaiStatus); - - for (ListTanggalCuti listTanggalCuti : model.getListTanggal()) { - listTgl.add(listTanggalCuti.getNoRec()); - } - result.put("listTgl", listTgl); - result.put("noRec", model.getNoRec()); - result.put("bisaCuti", true); - - return result; - } - @Override public Map setJatahCuti(KelompokShiftKerjaCustomVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(vo)) { for (FactoRateKelompokShiftVO vos : vo.getFactorRateKelompokShift()) { Date monthDayNow = new Date(); @@ -2323,14 +1836,14 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (dayPeriodInput.length() == 1) { dayPeriodInput = "0" + dayPeriodInput; } - String periodeInput = String.valueOf(Integer.valueOf(vos.getPeriode().toString()) - 1) + "-" - + monthPeriodInput + "-" + dayPeriodInput; + String periodeInput = Integer.parseInt(vos.getPeriode()) - 1 + "-" + monthPeriodInput + "-" + + dayPeriodInput; List listpegawai = pegawaiDao.findPegawaiStatusAktif(vos.getKelompokShift().getId(), periodeInput); for (Pegawai pegawai : listpegawai) { int todaysYear = Calendar.getInstance().get(Calendar.YEAR); int todaysYear1 = Integer - .valueOf(settingDataFixedDao.getSettingDataFixed("tahunPenangguhanException")); + .parseInt(settingDataFixedDao.getSettingDataFixed("tahunPenangguhanException")); // storing data cuti Map dataCuti = getDataCuti(pegawai.getId(), String.valueOf(todaysYear), vos.getKomponenIndex().getId()); // menghitung data @@ -2435,13 +1948,13 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (Integer.parseInt(vos.getPeriode()) > todaysYear) { jatahCutiDanIzin.setKomponenIndex(komponenIndexConverter .transferVOToModel(vos.getKomponenIndex(), new KomponenIndex())); - JatahCutiDanIzin currentData = jatahCutiDanIzinDao.getJatahCuti(vos.getPeriode().toString(), + JatahCutiDanIzin currentData = jatahCutiDanIzinDao.getJatahCuti(vos.getPeriode(), pegawai.getId(), vos.getKomponenIndex().getId()); if (CommonUtil.isNotNullOrEmpty(currentData)) { jatahCutiDanIzin.setNoRec(currentData.getNoRec()); } jatahCutiDanIzin.setValue(vos.getValue()); - jatahCutiDanIzin.setTahun(vos.getPeriode().toString()); + jatahCutiDanIzin.setTahun(vos.getPeriode()); jatahCutiDanIzin.setCutiTerpakai(0); jatahCutiDanIzin.setSisaCuti(vos.getValue()); jatahCutiDanIzin.setIsTangguhkan(false); @@ -2503,7 +2016,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi @Override public Map setJatahCutiPegawai(JatahCutiDanIzinVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); if (CommonUtil.isNotNullOrEmpty(vo)) { int todaysYear = Calendar.getInstance().get(Calendar.YEAR); int todaysYear1 = todaysYear - 1; @@ -2609,13 +2122,13 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (Integer.parseInt(vo.getTahun()) > todaysYear) { jatahCutiDanIzin.setKomponenIndex( komponenIndexConverter.transferVOToModel(vo.getKomponenIndex(), new KomponenIndex())); - JatahCutiDanIzin currentData = jatahCutiDanIzinDao.getJatahCuti(vo.getTahun().toString(), + JatahCutiDanIzin currentData = jatahCutiDanIzinDao.getJatahCuti(vo.getTahun(), vo.getPegawai().getId(), vo.getKomponenIndex().getId()); if (CommonUtil.isNotNullOrEmpty(currentData)) { jatahCutiDanIzin.setNoRec(currentData.getNoRec()); } jatahCutiDanIzin.setValue(vo.getValue()); - jatahCutiDanIzin.setTahun(vo.getTahun().toString()); + jatahCutiDanIzin.setTahun(vo.getTahun()); jatahCutiDanIzin.setCutiTerpakai(0); jatahCutiDanIzin.setSisaCuti(vo.getValue()); jatahCutiDanIzin.setIsTangguhkan(false); @@ -2675,20 +2188,18 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi @Override public List> getAllDataCuti() { String komponen = settingDataFixedDao.getSettingDataFixed("komponenIndeksCuti"); - List> result = jatahCutiDanIzinDao.getAllJatahCuti(Integer.valueOf(komponen)); - - return result; + return jatahCutiDanIzinDao.getAllJatahCuti(Integer.valueOf(komponen)); } @Override public List> getAllDataCuti(Integer idPegawai) { LocalDateTime now = LocalDateTime.now(); - Integer tahunIni = now.getYear(); - Integer tahunLalu = tahunIni - 1; - Integer duaTahunLalu = tahunIni - 2; + int tahunIni = now.getYear(); + int tahunLalu = tahunIni - 1; + int duaTahunLalu = tahunIni - 2; String batasPenangguhan = settingDataFixedDao.getSettingDataFixed("tglBatasPenangguhanCuti"); - String tglBatasPenangguhan = String.valueOf(now.getYear()) + "-" + batasPenangguhan; + String tglBatasPenangguhan = now.getYear() + "-" + batasPenangguhan; DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime penangguhanCutOff = LocalDateTime.parse(tglBatasPenangguhan, formatter); @@ -2731,11 +2242,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi SimpleDateFormat formatter = new SimpleDateFormat("yyyy"); String year = formatter.format(DateUtil.now()); - Integer yearn1 = Integer.parseInt(year) - 1; - String yearN1 = yearn1.toString(); + int yearn1 = Integer.parseInt(year) - 1; + String yearN1 = Integer.toString(yearn1); - Integer yearn2 = Integer.parseInt(year) - 2; - String yearN2 = yearn2.toString(); + int yearn2 = Integer.parseInt(year) - 2; + String yearN2 = Integer.toString(yearn2); Map dataCuti = this.getDataCuti(idPegawai, year, idStatusPegawai); @@ -2769,38 +2280,23 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi voDuaTahunLalu.setIsTangguhkan(false); this.setJatahCutiPegawaiRecursive(voDuaTahunLalu); - Map result = new HashMap<>(); - result.putAll(dataCuti); - - return result; + return new HashMap<>(dataCuti); } @Override public Map setJatahCutiRecursive(KelompokShiftKerjaCustomVO vo) { - /** - * set pertama untuk update data value(jatah cuti) ke tabel jatah cuti - */ + // set pertama untuk update data value(jatah cuti) ke tabel jatah cuti setJatahCuti(vo); - /** - * set kedua untuk getDataCuti() terbaru agar push ke tabel jatah cuti - */ - Map result = setJatahCuti(vo); - - return result; + // set kedua untuk getDataCuti() terbaru agar push ke tabel jatah cuti + return setJatahCuti(vo); } @Override public Map setJatahCutiPegawaiRecursive(JatahCutiDanIzinVO vo) { - /** - * set pertama untuk update data value(jatah cuti) ke tabel jatah cuti - */ + // set pertama untuk update data value(jatah cuti) ke tabel jatah cuti setJatahCutiPegawai(vo); - /** - * set kedua untuk getDataCuti() terbaru agar push ke tabel jatah cuti - */ - Map result = setJatahCutiPegawai(vo); - - return result; + // set kedua untuk getDataCuti() terbaru agar push ke tabel jatah cuti + return setJatahCutiPegawai(vo); } @Override @@ -2812,9 +2308,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi Calendar now = Calendar.getInstance(); int year = now.get(Calendar.YEAR); String tahun = String.valueOf(year); - /** - * komponen index cuti tahunan - */ + // komponen index cuti tahunan List listIdKomponenIndexId = new ArrayList<>(); listIdKomponenIndexId.add(5); listIdKomponenIndexId.add(6); @@ -2843,9 +2337,7 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi if (pegawaiSdm.contains(idPegawai)) { List> listDataCutiAlasanPenting = planningPegawaiStatusDaoCustom .getApprovalStatusCutiAlasanPentingDanSakit(); - for (Map map : listDataCutiAlasanPenting) { - listData.add(map); - } + listData.addAll(listDataCutiAlasanPenting); } if (CommonUtil.isNotNullOrEmpty(listData)) { @@ -2878,11 +2370,9 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi @Override public Integer countJumlahPengajuanTahunDepanDiprosesByPegawai(Integer idPegawai, Integer idPlan) { - Integer result = null; - result = planningPegawaiStatusDao.getJumlahPengajuanDiprosesTahunDepanByPegawai(idPegawai, idPlan); - if (CommonUtil.isNullOrEmpty(result)) { + Integer result = planningPegawaiStatusDao.getJumlahPengajuanDiprosesTahunDepanByPegawai(idPegawai, idPlan); + if (CommonUtil.isNullOrEmpty(result)) result = 0; - } return result; } @@ -2904,11 +2394,10 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi @Override public Integer countJumlahPengajuanTahunDepanDiprosesByPegawai(Integer idPegawai, Integer idPlan, String noPlanning) { - Integer result = null; - result = planningPegawaiStatusDao.getJumlahPengajuanDiprosesTahunDepanByPegawai(idPegawai, idPlan, noPlanning); - if (CommonUtil.isNullOrEmpty(result)) { + Integer result = planningPegawaiStatusDao.getJumlahPengajuanDiprosesTahunDepanByPegawai(idPegawai, idPlan, + noPlanning); + if (CommonUtil.isNullOrEmpty(result)) result = 0; - } return result; } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java index b96b80bb..ca250ac3 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java @@ -1,29 +1,5 @@ package com.jasamedika.medifirst2000.controller; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.security.core.Authentication; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.constants.MessageResource; @@ -39,30 +15,26 @@ import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.security.model.AppPermission; import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService; -import com.jasamedika.medifirst2000.service.KeluargaPegawaiService; -import com.jasamedika.medifirst2000.service.LogbookKinerjaService; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService; -import com.jasamedika.medifirst2000.service.PegawaiJadwalKerjaService; -import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.service.RiwayatJabatanService; -import com.jasamedika.medifirst2000.service.RiwayatPekerjaanService; -import com.jasamedika.medifirst2000.service.RiwayatPelatihanService; -import com.jasamedika.medifirst2000.service.RiwayatPendidikanService; +import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.JsonUtil; import com.jasamedika.medifirst2000.util.PasswordUtil; import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaExcelVO; -import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPegawaiMobileVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; -import com.jasamedika.medifirst2000.vo.RiwayatJabatanVO; -import com.jasamedika.medifirst2000.vo.RiwayatPekerjaanVO; -import com.jasamedika.medifirst2000.vo.RiwayatPelatihanVO; -import com.jasamedika.medifirst2000.vo.RiwayatPendidikanVO; +import com.jasamedika.medifirst2000.vo.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.*; /** * Controller class for Pasien Business @@ -162,8 +134,7 @@ public class PegawaiController extends LocaleController implements IB @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "namaLengkap", required = false) String namaLengkap) { - Map result = new HashMap(); - result = pegawaiService.getAllPegawai(page, take, sort, dir, id, namaLengkap); + Map result = pegawaiService.getAllPegawai(page, take, sort, dir, id, namaLengkap); return constructListPageResult(result); } @@ -352,22 +323,21 @@ public class PegawaiController extends LocaleController implements IB if (!loginUser.isEmpty()) { LoginUser user = loginUser.get(0); PasswordUtil passwordUtil = new PasswordUtil(); - Boolean isValidPassword = passwordUtil.isPasswordEqual(vo.getPassword(), user.getKataSandi()); + boolean isValidPassword = passwordUtil.isPasswordEqual(vo.getPassword(), user.getKataSandi()); if (isValidPassword) { PegawaiVO result = vo.getPegawaiVO(); return editVO(result); } else { - LOGGER.error("Got exception {} when update Pegawai, password invalid"); + LOGGER.error("Got exception when update Pegawai, password invalid"); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Password"); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } else { - LOGGER.error("Got exception {} when update Pegawai"); + LOGGER.error("Got exception when update Pegawai"); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "User is unauthorized"); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (Exception e) { - e.printStackTrace(); LOGGER.error("Got exception {} when update Pegawai", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); @@ -383,12 +353,10 @@ public class PegawaiController extends LocaleController implements IB return RestUtil.getJsonResponse("", HttpStatus.OK, mapHeaderMessage); } } catch (ServiceVOException e) { - e.printStackTrace(); LOGGER.error("Got exception {} when update Pegawai", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - jse.printStackTrace(); LOGGER.error("Got exception {} when update Pegawai", jse.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); @@ -439,10 +407,9 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/get-pegawai-by-id/{id}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getKelasByRuangan(@PathVariable("id") Integer id, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiById(id); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + Map result = pegawaiService.findPegawaiById(id); + boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -450,10 +417,10 @@ public class PegawaiController extends LocaleController implements IB mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -465,88 +432,83 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/get-pegawai-detail-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiDetailById(@PathVariable("id") Integer id) { - Map rekamDataPegawaiVO = new HashMap<>(); try { - rekamDataPegawaiVO = pegawaiService.findPegawaiDetailById(id); + Map rekamDataPegawaiVO = pegawaiService.findPegawaiDetailById(id); List> mappingJabatan = mapPegawaiJabatanToUnitKerjaService.findAllDetailByPegawai(id); rekamDataPegawaiVO.put("mappingJabatan", mappingJabatan); + return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); } @RequestMapping(value = "/get-peserta-didik-detail-by-customs/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPesertaDidikDetailById(@PathVariable("id") Integer id) { - Map rekamDataPegawaiVO = new HashMap<>(); try { - rekamDataPegawaiVO = pegawaiService.findPesertaDidikDetailById(id); + Map rekamDataPegawaiVO = pegawaiService.findPesertaDidikDetailById(id); + return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(rekamDataPegawaiVO, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-by-ruangan/{unitKerja}/{tahun}/{bulan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuangan(@PathVariable("unitKerja") Integer unitKerja, @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuangan(unitKerja, tahun, bulan); + Map result = pegawaiService.findPegawaiByRuangan(unitKerja, tahun, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-by-jadwal/{tahun}/{bulan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByJadwal(@PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuangan(0, tahun, bulan, pegawai); + Map result = pegawaiService.findPegawaiByRuangan(0, tahun, bulan, pegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian/{jabatan}/{pegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUraianPegawai(@PathVariable("jabatan") Integer jabatan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { - Map result = new HashMap<>(); try { + Map result = new HashMap<>(); result.put("items", JsonUtil.ToMaps(mapUraianTugasToRincianKegiatanDao .findByMapJabatanToUraianTugasId(mapUraianToJabatanDao.findByPegawaiId(pegawai).get(0).getId()))); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataPegawai(HttpServletRequest request) { - Map result = new HashMap<>(); try { - result = pegawaiService.dataAllPegawai(); + Map result = pegawaiService.dataAllPegawai(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-by-pelaksana", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPegawaiByPelaksana( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getPegawaiByPelaksana(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = pegawaiService.getPegawaiByPelaksana(id); if (null != result) { @@ -554,7 +516,7 @@ public class PegawaiController extends LocaleController implements IB getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getPegawaiByPelaksana", e.getMessage()); @@ -813,29 +775,27 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/find-pegawai-by-id-custom/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findpegawaiByIdCustom(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByIdCustom(idPegawai); + Map result = pegawaiService.findPegawaiByIdCustom(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-by-ruangan/{ruangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPegawaiByRuangan(@PathVariable("ruangan") Integer ruangan, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuangan(ruangan); + Map result = pegawaiService.findPegawaiByRuangan(ruangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-all-jadwal-pegawai-rev2/", method = RequestMethod.POST) @@ -882,15 +842,14 @@ public class PegawaiController extends LocaleController implements IB public ResponseEntity> getPegawaiByRuanganrev2( @PathVariable("subUnitKerja") Integer subUnitKerja, @PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.findPegawaiByRuanganRev2(subUnitKerja, tahun, bulan); + Map result = pegawaiService.findPegawaiByRuanganRev2(subUnitKerja, tahun, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-pegawai-aktif-by-ruangan/", method = RequestMethod.GET) @@ -993,9 +952,8 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/non-aktif-pegawai-by-id/{id}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> deletePegawai(@PathVariable("id") Integer id, HttpServletRequest request) { - Map result = null; try { - result = pegawaiService.nonAktifPegawai(id); + Map result = pegawaiService.nonAktifPegawai(id); if (CommonUtil.isNotNullOrEmpty(result)) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -1003,10 +961,10 @@ public class PegawaiController extends LocaleController implements IB mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-pensiun/{startPeriode}/{endPeriode}", method = RequestMethod.GET) @@ -1291,46 +1249,42 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/get-all-jabatan-by-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllJabatanByPegawai( @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = new ArrayList>(); try { - result = pegawaiService.findJabatanByPegawai(idPegawai); + List> result = pegawaiService.findJabatanByPegawai(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/jabatan-kontrak-verif-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanKontrakVerifKinerja(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "pegawaiLoginId") Integer idPegawaiLogin) { - List> result = new ArrayList>(); try { - result = logbookKinerjaService.findJabatanKontrakVerifKinerja(idPegawai, idPegawaiLogin); + List> result = logbookKinerjaService.findJabatanKontrakVerifKinerja(idPegawai, + idPegawaiLogin); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/jabatan-logbook-kinerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanLogbookKinerja(HttpServletRequest request, @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "bulan") Long bulan) { - List> result = new ArrayList>(); try { - result = logbookKinerjaService.findJabatanByLogbookPegawai(idPegawai, bulan); + List> result = logbookKinerjaService.findJabatanByLogbookPegawai(idPegawai, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-jurusan-by-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -1354,15 +1308,14 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/get-all-pangkat-golongan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllPangkatGolongan(HttpServletRequest request) { - List> result = new ArrayList>(); try { - result = pegawaiService.findAllPangkatGolongan(); + List> result = pegawaiService.findAllPangkatGolongan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-pegawai-pendapatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -1370,7 +1323,7 @@ public class PegawaiController extends LocaleController implements IB @RequestParam(value = "idDepartemen", required = false) Integer idDepartemen, @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "idUnitKerja", required = false) Integer idUnitKerja, - @RequestParam(value = "month", required = true) String month) { + @RequestParam(value = "month") String month) { Map result = new HashMap<>(); try { if (CommonUtil.isNotNullOrEmpty(idDepartemen) && CommonUtil.isNullOrEmpty(idRuangan)) { @@ -1416,7 +1369,7 @@ public class PegawaiController extends LocaleController implements IB @RequestMapping(value = "/check-existing-fingerid", method = RequestMethod.GET) public ResponseEntity>> findExistingFingerId(HttpServletRequest request, - @RequestParam(value = "fingerId", required = true) String idFinger, + @RequestParam(value = "fingerId") String idFinger, @RequestParam(value = "pegawaiId", required = false) Integer idPegawai) { try { List> result = pegawaiService.findExistingFingerId(idFinger, idPegawai); diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index 5a02389a..6a0a9cfb 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -1,32 +1,5 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.Resource; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.constants.MessageResource; @@ -39,103 +12,26 @@ import com.jasamedika.medifirst2000.entities.MapUraianTugasToRincianKegiatan; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AbsensiPegawaiService; -import com.jasamedika.medifirst2000.service.ActivityPegawaiService; -import com.jasamedika.medifirst2000.service.AnggaranRemunerasiService; -import com.jasamedika.medifirst2000.service.AsuransiNakerService; -import com.jasamedika.medifirst2000.service.AturanPeminjamanService; -import com.jasamedika.medifirst2000.service.BerkasLamaranService; -import com.jasamedika.medifirst2000.service.BibliographyService; -import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService; -import com.jasamedika.medifirst2000.service.CustomIndexKerjaService; -import com.jasamedika.medifirst2000.service.DaftarKeanggotaanService; -import com.jasamedika.medifirst2000.service.DataKeluargaService; -import com.jasamedika.medifirst2000.service.DataPegawaiService; -import com.jasamedika.medifirst2000.service.DegreeService; -import com.jasamedika.medifirst2000.service.EvaluasiJabatanService; -import com.jasamedika.medifirst2000.service.FaktorEvaluasiService; -import com.jasamedika.medifirst2000.service.FakultasService; -import com.jasamedika.medifirst2000.service.GajiPokokService; -import com.jasamedika.medifirst2000.service.GolonganService; -import com.jasamedika.medifirst2000.service.IndekKinerjaService; -import com.jasamedika.medifirst2000.service.InformasiDaftarGajiService; -import com.jasamedika.medifirst2000.service.InputDaftarPaketPelatihanService; -import com.jasamedika.medifirst2000.service.InputDaftarPaketSeminarService; -import com.jasamedika.medifirst2000.service.InstitusiPendidikanService; -import com.jasamedika.medifirst2000.service.IsianPelamarService; -import com.jasamedika.medifirst2000.service.JabatanService; -import com.jasamedika.medifirst2000.service.JadwalDokterService; -import com.jasamedika.medifirst2000.service.JadwalOrientasiService; -import com.jasamedika.medifirst2000.service.JenisCutiService; -import com.jasamedika.medifirst2000.service.JenisGajiService; -import com.jasamedika.medifirst2000.service.JenisHonorService; -import com.jasamedika.medifirst2000.service.JenisKompetensiService; -import com.jasamedika.medifirst2000.service.JenisPnsService; -import com.jasamedika.medifirst2000.service.JenisSkService; -import com.jasamedika.medifirst2000.service.JurusanPeminatanService; -import com.jasamedika.medifirst2000.service.KategoriPegawaiService; -import com.jasamedika.medifirst2000.service.KategoryTugasService; -import com.jasamedika.medifirst2000.service.KedudukanService; -import com.jasamedika.medifirst2000.service.KelompokKompetensiService; -import com.jasamedika.medifirst2000.service.KompetensiService; -import com.jasamedika.medifirst2000.service.LogAccService; -import com.jasamedika.medifirst2000.service.MapJabatanProfesiService; -import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService; -import com.jasamedika.medifirst2000.service.MasterEvaluasiJabatanService; -import com.jasamedika.medifirst2000.service.MasterHonorTimService; -import com.jasamedika.medifirst2000.service.MasterJenisSantunanService; -import com.jasamedika.medifirst2000.service.MonitoringAbsenService; -import com.jasamedika.medifirst2000.service.MutasiPegawaiService; -import com.jasamedika.medifirst2000.service.NamaAsuransiService; -import com.jasamedika.medifirst2000.service.NamaPegawaiService; -import com.jasamedika.medifirst2000.service.NamaPembimbingService; -import com.jasamedika.medifirst2000.service.NilaiKelompokJabatanService; -import com.jasamedika.medifirst2000.service.PegawaiJadwalKerjaService; -import com.jasamedika.medifirst2000.service.PegawaiMutasiSanksiResignService; -import com.jasamedika.medifirst2000.service.PekerjaanService; -import com.jasamedika.medifirst2000.service.PendapatanService; -import com.jasamedika.medifirst2000.service.PerhitunganAbkService; -import com.jasamedika.medifirst2000.service.PerhitunganHonorTimPegawaiService; -import com.jasamedika.medifirst2000.service.PerhitunganPremiBPJSKesehatanService; -import com.jasamedika.medifirst2000.service.PerhitunganPremiBPJSKetenagaKerjaanService; -import com.jasamedika.medifirst2000.service.PerhitunganSantunanPegawaiMeninggalDuniaService; -import com.jasamedika.medifirst2000.service.PerhitunganUangLemburPegawaiService; -import com.jasamedika.medifirst2000.service.PeriodePengajarService; -import com.jasamedika.medifirst2000.service.PeriodePinjamanService; -import com.jasamedika.medifirst2000.service.PermohonanCutiPegawaiService; -import com.jasamedika.medifirst2000.service.PermohonanStatusPegawaiService; -import com.jasamedika.medifirst2000.service.PernelitianEksternalService; -import com.jasamedika.medifirst2000.service.PosisiLamaranService; -import com.jasamedika.medifirst2000.service.ProfesiService; -import com.jasamedika.medifirst2000.service.ProgramPendidikanService; -import com.jasamedika.medifirst2000.service.ProgramPengajaranService; -import com.jasamedika.medifirst2000.service.RangeKmkService; -import com.jasamedika.medifirst2000.service.RegistrasiKeanggotaanService; -import com.jasamedika.medifirst2000.service.RekamDataPegawaiService; -import com.jasamedika.medifirst2000.service.RekamUraianRincianKegiatanService; -import com.jasamedika.medifirst2000.service.RemunerasiOperasionalService; -import com.jasamedika.medifirst2000.service.RemunerasiService; -import com.jasamedika.medifirst2000.service.ReservasiService; -import com.jasamedika.medifirst2000.service.RiwayatJabatanService; -import com.jasamedika.medifirst2000.service.RiwayatPendidikanService; -import com.jasamedika.medifirst2000.service.RiwayatPenilaianKompetensiPegawaiService; -import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.service.ShiftKerjaService; -import com.jasamedika.medifirst2000.service.SimulasiPendapatanService; -import com.jasamedika.medifirst2000.service.StatusKawinService; -import com.jasamedika.medifirst2000.service.StatusMeninggalDuniaService; -import com.jasamedika.medifirst2000.service.StatusPegawaiService; -import com.jasamedika.medifirst2000.service.TahunUmrService; -import com.jasamedika.medifirst2000.service.TanggunganService; -import com.jasamedika.medifirst2000.service.TipeKeanggotaanService; -import com.jasamedika.medifirst2000.service.TipeKoleksiService; -import com.jasamedika.medifirst2000.service.UnitKerjaPegawaiService; -import com.jasamedika.medifirst2000.service.UraianTugasService; -import com.jasamedika.medifirst2000.service.UraianTugasTransaksiService; +import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.rest.RestUtil; import com.jasamedika.medifirst2000.vo.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.*; @RestController @RequestMapping("/sdm") @@ -433,7 +329,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-custom-uraian-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = customIndexKerjaService.saveCustomIndexKerja(vo); if (null != result) @@ -455,34 +351,32 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/generate-logbook-dokter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> generateLogbookDokter(HttpServletRequest request) { - Map result = null; try { indekKinerjaService.generateAllTindakanDokter(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonHttptatus(HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-custom-uraian-kerja/{id}/{tanggal}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getCustomUraianKerja(@PathVariable("id") String id, @PathVariable("tanggal") String tanggal, HttpServletRequest request) { - Map result = null; try { - result = customIndexKerjaService.findByPegawaiAndData(id, DateUtil.toDate(tanggal)); + Map result = customIndexKerjaService.findByPegawaiAndData(id, DateUtil.toDate(tanggal)); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-berkas-lamaran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody BerkasLamaranVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = berkasLamaranService.saveBerkasLamaran(vo); if (null != result) @@ -504,22 +398,19 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-berkas-lamaran/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getsaveBerkasLamaran(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = berkasLamaranService.findByNamaPelamarNoRec(nama); + Map result = berkasLamaranService.findByNamaPelamarNoRec(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-reservasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveReservasi(@Valid @RequestBody ReservasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = reservasiService.saveReservasi(vo); if (null != result) @@ -540,7 +431,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-pengembalian", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePengembalian(@Valid @RequestBody ReservasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = reservasiService.saveReservasi(vo); if (null != result) @@ -561,7 +452,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/upload-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.ALL_VALUE) public ResponseEntity> uploadAbsen(@Valid @RequestBody UploadExcelVO fileInput, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = jadwalDokterService.uploadAbsensi(fileInput); if (null != result) @@ -582,7 +473,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveAbsen(@Valid @RequestBody SaveAbsenVO fileInput, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = null; for (AbsensiPegawaiVO absensiPegawaiVO : fileInput.getData()) { @@ -607,30 +498,28 @@ public class SdmController extends LocaleController { public ResponseEntity> savejadwalAbsenPegawai(@PathVariable("idFinger") String idFinger, @PathVariable("tanggalMasuk") String tanggalMasuk, @PathVariable("tanggalKeluar") String tanggalKeluar, HttpServletRequest request) { - Map result = null; try { - result = jadwalDokterService.saveJadwalPegawai(idFinger, DateUtil.toDate(tanggalMasuk), + Map result = jadwalDokterService.saveJadwalPegawai(idFinger, DateUtil.toDate(tanggalMasuk), DateUtil.toDate(tanggalKeluar)); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-reservasi-by-anggota/{norec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getReservasiByNoRec(@PathVariable("norec") String norec, HttpServletRequest request) { - Map result = null; try { - result = reservasiService.findReservasiByAnggota(norec); + Map result = reservasiService.findReservasiByAnggota(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-degree", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -1115,7 +1004,7 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/delete-shift-kerja/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deleteShiftKerja(@RequestParam(value = "id", required = true) Integer id, + public ResponseEntity> deleteShiftKerja(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = shiftKerjaService.deleteShiftKerja(id); @@ -1200,17 +1089,14 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-bibliography/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getBibliography(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = bibliographyService.findByName(nama); + Map result = bibliographyService.findByName(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-daftar-keanggotaan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -1327,7 +1213,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getLoadData", e.getMessage()); @@ -1493,17 +1379,14 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-registrasi-keanggotaan/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRegistrasiKeanggotaan(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = registrasiKeanggotaanService.findByName(nama); + Map result = registrasiKeanggotaanService.findByName(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/hapus-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -1619,15 +1502,14 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-isian-pelamar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getIsianPelamar(HttpServletRequest request) { - Map result = null; try { - result = IsianPelamarService.findDataPelamar(); + Map result = IsianPelamarService.findDataPelamar(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-asuransi-naker", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -1892,23 +1774,21 @@ public class SdmController extends LocaleController { public ResponseEntity> getPegawaiByJadwal(@PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.findPegawaiByRuangan(tahun, bulan, pegawai); + Map result = indekKinerjaService.findPegawaiByRuangan(tahun, bulan, pegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/set-uraian-tugas/{id}/{bobot}/{target}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> setBobot(@PathVariable("id") Integer id, @PathVariable("bobot") Integer bobot, @PathVariable("target") Integer target, HttpServletRequest request) { - Map result = null; try { - result = new HashMap<>(); + Map result = new HashMap<>(); MapUraianTugasToRincianKegiatan model = mapUraianTugasToRincianKegiatanDao.findOne(id); model.setBobot(bobot.toString()); @@ -1920,10 +1800,10 @@ public class SdmController extends LocaleController { mapUraianTugasToRincianKegiatanDao.save(model); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/add-uraian-tugas/{id}/{group}/{bobot}/{target}/{description}/{jabatanId}/{pegawaiId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -1932,9 +1812,8 @@ public class SdmController extends LocaleController { @PathVariable("group") String group, @PathVariable("description") String description, @PathVariable("jabatanId") Integer jabatanId, @PathVariable("pegawaiId") Integer pegawaiId, HttpServletRequest request) { - Map result = null; try { - result = new HashMap<>(); + Map result = new HashMap<>(); MapUraianTugasToRincianKegiatan model = mapUraianTugasToRincianKegiatanDao.findOne(id); model.setBobot(bobot.toString()); @@ -1946,10 +1825,10 @@ public class SdmController extends LocaleController { mapUraianTugasToRincianKegiatanDao.save(model); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-jenis-kompetensi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -2166,29 +2045,27 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListJabatan(HttpServletRequest request) { - Map result = null; try { - result = MasterEvaluasiJabatanService.findJabatan(); + Map result = MasterEvaluasiJabatanService.findJabatan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-by-jabatan/{idJabatan}/{bulan}/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListByJabatan(@PathVariable("idJabatan") Integer idJabatan, @PathVariable("bulan") String bulan, @PathVariable("tahun") Integer tahun, HttpServletRequest request) { - Map result = null; try { - result = MasterEvaluasiJabatanService.findEvaluasiByJabatan(idJabatan, tahun, bulan); + Map result = MasterEvaluasiJabatanService.findEvaluasiByJabatan(idJabatan, tahun, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-evaluasi-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -2215,64 +2092,60 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getEvaluasiJabatan(@RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "bulan") String bulan, @RequestParam(value = "ruangan") Integer ruangan, - HttpServletRequest request) throws ParseException { - Map result = null; + HttpServletRequest request) { try { - result = evaluasiJabatanService.findEvaluasiJabatan(tahun, bulan, ruangan); + Map result = evaluasiJabatanService.findEvaluasiJabatan(tahun, bulan, ruangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-count-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getCountEvaluasiJabatan(@RequestParam(value = "tahun") Integer tahun, - HttpServletRequest request) throws ParseException { - Map result = null; + HttpServletRequest request) { try { - result = evaluasiJabatanService.CountEvaluasi(tahun); + Map result = evaluasiJabatanService.CountEvaluasi(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekap", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRekap(@RequestParam(value = "tahun") Integer tahun, - HttpServletRequest request) throws ParseException { - Map result = null; + HttpServletRequest request) { try { - result = evaluasiJabatanService.findPegawaiByTahun(tahun); + Map result = evaluasiJabatanService.findPegawaiByTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-evaluasi-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getEvaluasiPegawai(@RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "bulan") Integer bulan, - HttpServletRequest request) throws ParseException { - Map result = null; + HttpServletRequest request) { try { - result = evaluasiJabatanService.findPegawaiByTahun(tahun, idPegawai); + Map result = evaluasiJabatanService.findPegawaiByTahun(tahun, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-simulasi-pendapatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveSimulasiPendapatan(@Valid @RequestBody SimulasiPendapatanVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = simulasiPendapatanService.saveSimulasiPendapatan(vo); if (null != result) @@ -2294,20 +2167,19 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-save-simulasi-pendapatan/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getsaveSimulasiPendapatan(@PathVariable("tahun") Integer tahun, HttpServletRequest request) { - Map result = null; try { - result = simulasiPendapatanService.findByTahun(tahun); + Map result = simulasiPendapatanService.findByTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-perhitungan-abk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganAbk(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = PerhitunganAbkService.savePerhitunganAbk(vo); if (null != result) @@ -2328,21 +2200,20 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-perhitungan-abk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPerhitunganAbk(@RequestParam(value = "tahun") Integer tahun, - HttpServletRequest request) throws ParseException { - Map result = null; + HttpServletRequest request) { try { - result = PerhitunganAbkService.findByTahun(tahun); + Map result = PerhitunganAbkService.findByTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-jadwal-orientasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveJadwalOrientasi(@Valid @RequestBody JadwalOrientasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = jadwalOrientasiService.saveJadwalOrientasi(vo); if (null != result) @@ -2364,48 +2235,42 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-save-jadwal-orientasi/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getsaveJadwalOrientasi(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = jadwalOrientasiService.findByName(nama); + Map result = jadwalOrientasiService.findByName(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-tindakan-by-user-id/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByUserId(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - List> result = null; try { - System.out.println(endDate); - result = indekKinerjaService.findByUserId(startDate, endDate); + List> result = indekKinerjaService.findByUserId(startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-tindakan-by-period/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanByPeriod( @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findAllTindakanByPeriod(idPegawai); + List> result = indekKinerjaService.findAllTindakanByPeriod(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-logbook-summary-by-user-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -2413,90 +2278,86 @@ public class SdmController extends LocaleController { @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "startDate") String startDate, @RequestParam(value = "endDate") String endDate, @RequestParam(value = "idTindakan") Integer idProduk, HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findTindakanByUserId(idPegawai, startDate, endDate, idProduk); + List> result = indekKinerjaService.findTindakanByUserId(idPegawai, startDate, endDate, + idProduk); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-tindakan-by-user-id-and-periode/{month}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByIdUserAndPeriod(@PathVariable("month") String month, HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findTindakanByIdUserAndPeriod(month); + List> result = indekKinerjaService.findTindakanByIdUserAndPeriod(month); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerja(HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findUraianTugas();// validasitargetbobotnull + List> result = indekKinerjaService.findUraianTugas();// validasitargetbobotnull mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-persen-uraian-kerja/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPersen(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findCountTindakanByIdUserAndPeriod(idPegawai, startDate, endDate); + List> result = indekKinerjaService.findCountTindakanByIdUserAndPeriod(idPegawai, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-poin/{tgl}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDetailPoin(@PathVariable("tgl") String tgl, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.detailPoin(tgl, idPegawai); + Map result = indekKinerjaService.detailPoin(tgl, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekap-poin/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRekapPoin(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.rekapPoin(month, idPegawai); + Map result = indekKinerjaService.rekapPoin(month, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-uraian-tugas-transaksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugasTransaksi(@Valid @RequestBody UraianTugasCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveUraianTugas(vo); if (null != result) @@ -2520,75 +2381,70 @@ public class SdmController extends LocaleController { public ResponseEntity> getIndekKinerjaKuantitas(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, @RequestParam(value = "isNew", required = false) Boolean isNew, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.getIndekKinerjaKuantitasData(month, idPegawai, isNew); + Map result = indekKinerjaService.getIndekKinerjaKuantitasData(month, idPegawai, isNew); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekapitulasi-capaian/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRekapitulasiCapaian(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.getRekapitulasiCapaianUraianTugas(month, idPegawai); + Map result = indekKinerjaService.getRekapitulasiCapaianUraianTugas(month, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian-kerja-dan-capaian/{date}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerjaDanCapaian(@PathVariable("date") String date, HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findUraianTugasByTanggal(date); + List> result = indekKinerjaService.findUraianTugasByTanggal(date); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-target-bobot-uraian-kerja/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getTargetBobotUraianKerja(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { - Map result = null; try { - result = uraianTugasTransaksiService.findTargetAndBobot(idPegawai, periode); + Map result = uraianTugasTransaksiService.findTargetAndBobot(idPegawai, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-id-pgw", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getIDs(HttpServletRequest request) { - Pegawai result = null; try { - result = indekKinerjaService.getPegawaiByUserLogin(); + Pegawai result = indekKinerjaService.getPegawaiByUserLogin(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-target-bobot-uraian-tugas-transaksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveTargetBobotUraianTugasTransaksi( - @Valid @RequestBody UraianTugasCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody UraianTugasCustomVO vo, HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveTargetBobotUraianTugas(vo); if (null != result) @@ -2609,7 +2465,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-indeks-kinerja-individu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveIndeksKinerjaindividu(@Valid @RequestBody IndeksKinerjaIndividuVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = indekKinerjaService.saveIndekKinerjaIndividu(vo); if (null != result) @@ -2630,7 +2486,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-list-indeks-kinerja-individu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveListIndeksKinerjaindividu( - @Valid @RequestBody IndeksKinerjaIndividuCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody IndeksKinerjaIndividuCustomVO vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveAllIndekKinerja(vo); if (null != result) @@ -2652,20 +2508,19 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-kualitas-inovasi-IKI/{periode}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKualitasAndInovasi(@PathVariable("periode") String periode, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.findKualitasAndInovasi(periode, idPegawai); + Map result = indekKinerjaService.findKualitasAndInovasi(periode, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-presensi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailPresensi(HttpServletRequest request, - @RequestParam(value = "listTrNo", required = true) List listTrNo) { + @RequestParam(value = "listTrNo") List listTrNo) { try { List> result = absensiPegawaiService.findDetailPresensi(listTrNo); if (null != result) @@ -2685,8 +2540,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-reverse-geocoding", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getReverseGeocoding(HttpServletRequest request, - @RequestParam(value = "latitude", required = true) Double latitude, - @RequestParam(value = "longitude", required = true) Double longitude) { + @RequestParam(value = "latitude") Double latitude, @RequestParam(value = "longitude") Double longitude) { try { String result = absensiPegawaiService.findReverseGeocoding(latitude, longitude); if (null != result) @@ -2706,7 +2560,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-monitoring-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveMonitoringAbsen(@Valid @RequestBody MonitoringAbsenCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveMonitoring(vo); if (null != result) @@ -2728,15 +2582,14 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-kehadiran-iki/{periode}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranIKI(@PathVariable("periode") String periode, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.findKehadiran(periode, idPegawai); + Map result = indekKinerjaService.findKehadiran(periode, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-presensi-kehadiran", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -2755,7 +2608,7 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when get presensi kehadiran", e.getMessage()); @@ -2774,94 +2627,91 @@ public class SdmController extends LocaleController { public ResponseEntity> findKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.jumlahKehadiran(null, null, idPegawai, startDate, endDate); + Map result = monitoringAbsenService.jumlahKehadiran(null, null, idPegawai, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranByRuangan(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, null, null, startDate, endDate); + Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, null, null, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{idSubUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranByRuangan(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("idSubUnitKerja") Integer idSubUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, idSubUnitKerja, null, startDate, endDate); + Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, idSubUnitKerja, null, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-all-pegawai/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findAllKehadiran(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.findKehadiranAllPegawai(startDate, endDate); + Map result = monitoringAbsenService.findKehadiranAllPegawai(startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekap-IKI/{idRuangan}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findRekapIKI(@PathVariable("idRuangan") Integer idRuangan, @PathVariable("periode") String periode, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.rekapIKI(idRuangan, periode); + Map result = indekKinerjaService.rekapIKI(idRuangan, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-penilaian-kompetensi/{idJabatan}/{tglPenilaian}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findRekapIKI(@PathVariable("idJabatan") Integer idJabatan, @PathVariable("tglPenilaian") String tglPenilaian, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - result = riwayatPenilaianKompetensiPegawaiService.getPenilaianKompetensiPegawai(idJabatan, tglPenilaian, - idPegawai);// bp + Map result = riwayatPenilaianKompetensiPegawaiService + .getPenilaianKompetensiPegawai(idJabatan, tglPenilaian, idPegawai);// bp mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-penilaian-kompetensi-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePenilaianKompetensiPegawai(@Valid @RequestBody StrukHistoriVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = riwayatPenilaianKompetensiPegawaiService.savePenilaianKompetensiPegawai(vo); if (null != result) @@ -2910,7 +2760,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getUserLogin", e.getMessage()); @@ -2924,7 +2774,7 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-data-by-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataByPegawai(@RequestParam(value = "id", required = true) Integer id, + public ResponseEntity> getDataByPegawai(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = serviceMusare.getDataMuSaReByPegawai(id); @@ -2933,7 +2783,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataByPegawai", e.getMessage()); @@ -2948,7 +2798,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-pengajuan-mutasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanMutasi( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanMutasi(ruanganId); if (null != result) { @@ -2956,7 +2806,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when loadPagePengajuanMutasi", e.getMessage()); @@ -2991,8 +2841,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-list-pengajuan-mutasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListPengajuanMutasi( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getListPengajuanMutasi(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanMutasi(id); if (null != result) { @@ -3000,7 +2850,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPengajuanMutasi", e.getMessage()); @@ -3015,7 +2865,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-pengajuan-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanSanksi( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanSanksi(ruanganId); if (null != result) { @@ -3023,7 +2873,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when loadPagePengajuanSanksi", e.getMessage()); @@ -3058,8 +2908,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-list-pengajuan-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListPengajuanSanksi( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getListPengajuanSanksi(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanSanksi(id); if (null != result) { @@ -3067,7 +2917,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPengajuanSanksi", e.getMessage()); @@ -3082,7 +2932,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-pengajuan-resign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanResign( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanResign(ruanganId); if (null != result) { @@ -3090,7 +2940,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when loadPagePengajuanResign", e.getMessage()); @@ -3125,8 +2975,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-list-pengajuan-resign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListPengajuanResign( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getListPengajuanResign(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanResign(id); if (null != result) { @@ -3134,7 +2984,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPengajuanResign", e.getMessage()); @@ -3149,7 +2999,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-pengajuan-musare", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListDaftarMuSaRe( - @RequestParam(value = "namaPegawai", required = true) String namaPegawai, HttpServletRequest request) { + @RequestParam(value = "namaPegawai") String namaPegawai, HttpServletRequest request) { try { Map result = serviceMusare.getListDaftarMuSaRe(namaPegawai); if (null != result) { @@ -3157,7 +3007,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListDaftarMuSaRe", e.getMessage()); @@ -3214,7 +3064,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-history-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecSanksi( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecSanksi(pegawaiId); if (null != result) { @@ -3222,7 +3072,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getHistoryExecSanksi", e.getMessage()); @@ -3237,7 +3087,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-history-pangkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecPangkat( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecPangkat(pegawaiId); if (null != result) { @@ -3245,7 +3095,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getHistoryExecPangkat", e.getMessage()); @@ -3260,7 +3110,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-history-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecJabatan( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecJabatan(pegawaiId); if (null != result) { @@ -3268,7 +3118,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getHistoryExecJabatan", e.getMessage()); @@ -3283,7 +3133,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-login-user-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUserLoginPermohonanStatus(HttpServletRequest request, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai) { + @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = servicePermohonanStatus.getUserLogin(idPegawai); if (null != result) { @@ -3291,7 +3141,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when servicePermohonanStatus", e.getMessage()); @@ -3306,7 +3156,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-jabatan-login-user", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getJabatanUserLogin(HttpServletRequest request, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai) { + @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = servicePermohonanStatus.getUserLogin(idPegawai); if (null != result) { @@ -3314,7 +3164,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when servicePermohonanStatus", e.getMessage()); @@ -3329,8 +3179,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData( - @RequestParam(value = "subUnitKerjaId", required = true) Integer subUnitKerjaId, - HttpServletRequest request) { + @RequestParam(value = "subUnitKerjaId") Integer subUnitKerjaId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getLoadData(subUnitKerjaId); if (null != result) { @@ -3338,7 +3187,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getLoadData", e.getMessage()); @@ -3352,10 +3201,9 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-data-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataCuti( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, + public ResponseEntity> getDataCuti(@RequestParam(value = "pegawaiId") Integer pegawaiId, @RequestParam(value = "year", required = false) String year, - @RequestParam(value = "statusPegawaiId", required = true) Integer statusPegawaiId, + @RequestParam(value = "statusPegawaiId") Integer statusPegawaiId, @RequestParam(value = "kategoriPegawaiId", required = false) Integer kategoriPegawaiId, HttpServletRequest request) { try { @@ -3365,7 +3213,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataCuti", e.getMessage()); @@ -3380,9 +3228,9 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/perbarui-data-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> perbaruiDataCuti(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "year", required = false) String year, - @RequestParam(value = "statusPegawaiId", required = true) Integer idStatusPegawai) { + @RequestParam(value = "statusPegawaiId") Integer idStatusPegawai) { try { Map result = servicePermohonanStatus.perbaruiDataCuti(idPegawai, idStatusPegawai); if (null != result) { @@ -3390,7 +3238,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_UPDATE_DATA_CUTI, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when perbaruiDataCuti", e.getMessage()); @@ -3405,7 +3253,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-data-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataPermohonanStatus( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getDataPermohonanStatus(pegawaiId); if (null != result) { @@ -3413,7 +3261,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataPermohonanStatus", e.getMessage()); @@ -3428,7 +3276,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-data-map-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataMPermohonanStatus( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getDataMapPermohonanStatus(pegawaiId); if (null != result) { @@ -3436,7 +3284,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataPermohonanStatus", e.getMessage()); @@ -3459,7 +3307,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage()); @@ -3474,7 +3322,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-approval-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListApprovalStatus( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, HttpServletRequest request) { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getApprovalStatus(idPegawai); if (null != result) { @@ -3482,7 +3330,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage()); @@ -3497,7 +3345,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-tanggal-permohonan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListTanggalPermohonan( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, HttpServletRequest request) { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { List> result = servicePermohonanStatus.getListTanggalPermohonan(idPegawai); if (null != result) { @@ -3505,7 +3353,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListTanggalPermohonan", e.getMessage()); @@ -3524,7 +3372,7 @@ public class SdmController extends LocaleController { @RequestParam(value = "take", required = false, defaultValue = "5") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "namaLengkap asc, a.tglPengajuan") String sort, @RequestParam(value = "dir", required = false, defaultValue = "desc") String dir, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "jenisPermohonan", required = false) String jenisPermohonan, @RequestParam(value = "statusPermohonan", required = false) Integer statusPermohonan, @@ -3541,7 +3389,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage()); @@ -3556,8 +3404,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-approval-status-by-planning", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListApprovalStatusByNorecPlanning( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { + @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { Map result = servicePermohonanStatus.getApprovalStatusByNorecPlanning(idPegawai, noRec); if (null != result) { @@ -3565,7 +3413,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage()); @@ -3580,7 +3428,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-approval-status-by-status-pegawai-plan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getApprovalStatusByStatusPegawaiPlan( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "statusPegawaiPlanId", required = false) Integer statusPegawaiPlanId, HttpServletRequest request) { try { @@ -3591,7 +3439,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage()); @@ -3613,7 +3461,7 @@ public class SdmController extends LocaleController { boolean statusTanggalPermohonan = servicePermohonanStatus.validateTanggalPermohonanRev( vo.getStatusPegawaiPlan().getId(), vo.getListTanggal(), vo.getPegawai().getId()); if (CommonUtil.isNotNullOrEmpty(statusTanggalPermohonan) && !statusTanggalPermohonan) { - result.put("bisaCuti", statusTanggalPermohonan); + result.put("bisaCuti", false); result.put("status", "Tanggal Permohonan sudah pernah diajukan!"); // Validasi_tanggal_permohonan_yang_sudah_diajukan return RestUtil.getJsonResponse(result, HttpStatus.OK); } @@ -3646,7 +3494,7 @@ public class SdmController extends LocaleController { vo.getStatusPegawaiPlan().getId(), vo.getListTanggal(), vo.getPegawai().getId()); if (CommonUtil.isNotNullOrEmpty(statusTanggalPermohonan) && !statusTanggalPermohonan) { - result.put("bisaCuti", statusTanggalPermohonan); + result.put("bisaCuti", false); result.put("status", "Tanggal Permohonan sudah pernah diajukan!"); // Validasi_tanggal_permohonan_yang_sudah_diajukan return RestUtil.getJsonResponse(result, HttpStatus.OK); } else { @@ -3690,8 +3538,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/delete-pegawai-status/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deletePlanningPegawaiStatus( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { + public ResponseEntity> deletePlanningPegawaiStatus(@RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { Map result = servicePermohonanStatus.deletePlanningPegawaiStatus(noRec); if (null != result) @@ -3767,7 +3615,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getPeriodeRekap", e.getMessage()); @@ -3781,8 +3629,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-daftar-gaji-pns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDaftarGajiPns( - @RequestParam(value = "periode", required = true) String periode, HttpServletRequest request) { + public ResponseEntity> getDaftarGajiPns(@RequestParam(value = "periode") String periode, + HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDaftarGajiPns(periode); if (null != result) { @@ -3790,7 +3638,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getStrukHistori", e.getMessage()); @@ -3804,11 +3652,9 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-detail-gaji-pns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDtailGajiPns( - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "id", required = true) Integer id, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "namaPegawai", required = true) String namaPegawai, HttpServletRequest request) { + public ResponseEntity> getDtailGajiPns(@RequestParam(value = "noRec") String noRec, + @RequestParam(value = "id") Integer id, @RequestParam(value = "periode") String periode, + @RequestParam(value = "namaPegawai") String namaPegawai, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDtailGajiPns(noRec, id, namaPegawai, periode); if (null != result) { @@ -3816,7 +3662,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataGajiPegawai", e.getMessage()); @@ -3830,8 +3676,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-daftar-gaji-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDaftarGajiPkwt( - @RequestParam(value = "periode", required = true) String periode, HttpServletRequest request) { + public ResponseEntity> getDaftarGajiPkwt(@RequestParam(value = "periode") String periode, + HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDaftarGajiPkwt(periode); if (null != result) { @@ -3839,7 +3685,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDaftarGajiPkwt", e.getMessage()); @@ -3853,9 +3699,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-detail-gaji-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDtailGajiPkwt( - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getDtailGajiPkwt(@RequestParam(value = "noRec") String noRec, + @RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDtailGajiPkwt(noRec, id); if (null != result) { @@ -3863,7 +3708,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDtailGajiPkwt", e.getMessage()); @@ -3879,34 +3724,33 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-gap-kompetensi/{idRuangan}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> findGapKompetensi(@PathVariable("idRuangan") Integer idRuangan, @PathVariable("periode") String periode, HttpServletRequest request) { - List> result = null; try { - result = riwayatPenilaianKompetensiPegawaiService.getGapKompetensiPegawai(idRuangan, periode); + List> result = riwayatPenilaianKompetensiPegawaiService + .getGapKompetensiPegawai(idRuangan, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kompetensi-by-ruangan/{idRuangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findGapKompetensi(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) { - Map result = null; try { - result = riwayatPenilaianKompetensiPegawaiService.getKompetensiPegawai(idRuangan); + Map result = riwayatPenilaianKompetensiPegawaiService.getKompetensiPegawai(idRuangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-rekap-kehadiran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRekapKehadiran(@Valid @RequestBody StrukHistoriVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveRekapKomponen(vo); if (null != result) @@ -3927,7 +3771,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-total-index-kehadiran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveTotalIndexKehadiran(@Valid @RequestBody StrukHistoriVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveTotalIndexRekapitulasiKehadiran(vo); if (null != result) @@ -3948,7 +3792,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-factor-rate-kelompok-Shift", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveFactorRateKelompokShift( - @Valid @RequestBody KelompokShiftKerjaCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody KelompokShiftKerjaCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveFactorRate(vo); if (null != result) @@ -3969,122 +3813,119 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-rencana-tindak-lanjut", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> findRencanaTindakLanjut(HttpServletRequest request) { - List> result = null; try { - result = riwayatPenilaianKompetensiPegawaiService.getRencanaTindakLanjut(); + List> result = riwayatPenilaianKompetensiPegawaiService.getRencanaTindakLanjut(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.rekapitulasiKehadiranAllPegawai(idPegawai, startDate, endDate); + Map result = monitoringAbsenService.rekapitulasiKehadiranAllPegawai(idPegawai, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiranByUnitKerja( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerja(idUnitKerja, startDate, endDate); + Map result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerja(idUnitKerja, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja-rescored/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiranByUnitKerjaRev( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerjaRev(idUnitKerja, startDate, endDate); + Map result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerjaRev(idUnitKerja, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-index-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapIndeksKehadiranByUnitKerja( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.rekapitulasiIndeksKehadiranByunitKerja(idUnitKerja, startDate, endDate); + Map result = monitoringAbsenService.rekapitulasiIndeksKehadiranByunitKerja(idUnitKerja, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-index-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapIndeksKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.rekapitulasiIndexKehadiranAllPegawai(idPegawai, startDate, endDate); + Map result = monitoringAbsenService.rekapitulasiIndexKehadiranAllPegawai(idPegawai, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-komponen-index", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListKomponenIndex(HttpServletRequest request) { - List> result = null; try { - result = shiftKerjaService.getListKomponenIndex(); + List> result = shiftKerjaService.getListKomponenIndex(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-jadwal-Kerja/{idRuangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJadwalKerja(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) { - List> result = null; try { - result = pegawaiJadwalKerjaService.getShiftKerja(idRuangan); + List> result = pegawaiJadwalKerjaService.getShiftKerja(idRuangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-pegawai-jadwal-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveapegawaiJadwalKerja( - @Valid @RequestBody PegawaiJadwalKerjaCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody PegawaiJadwalKerjaCustomVO vo, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaService.saveJadwalKerja(vo); if (null != result) @@ -4105,92 +3946,87 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-shift-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListShiftKerja(HttpServletRequest request) { - List> result = null; try { - result = shiftKerjaService.getListShiftKerja(); + List> result = shiftKerjaService.getListShiftKerja(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-keterangan-shift", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListKetShift(HttpServletRequest request) { - List> result = null; try { - result = shiftKerjaService.getListKetShift(); + List> result = shiftKerjaService.getListKetShift(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-factor-rate-shift-kerja/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListFactorRateShiftKerja(HttpServletRequest request, @PathVariable("periode") String periode) { - List> result = null; try { - result = monitoringAbsenService.findFactorRateIndekkehadiran(periode); + List> result = monitoringAbsenService.findFactorRateIndekkehadiran(periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - // Get data list Master Jabatan Evaluasi + // Get data list Jabatan Evaluasi @RequestMapping(value = "/get-list-master-evaluasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListMasterJabatanEvaluasiByTahunBulan( @RequestParam(value = "tahun", required = false) Integer tahun, @RequestParam(value = "bulan", required = false) String bulan, HttpServletRequest request) { - Map result = null; try { - result = evaluasiJabatanService.findEvaluasiJabatanTahun(tahun); + Map result = evaluasiJabatanService.findEvaluasiJabatanTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-lembur-sdm/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranLemburKerjaSdm(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, startDate, endDate); + Map result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-lembur-sdm-by-periode/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranLemburKerjaSdm(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { - Map result = null; try { - result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, periode); + Map result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-input-lembur-verifikasi-sdm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveInputLemburVerifikasiSdm( - @Valid @RequestBody InputLemburSdmCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody InputLemburSdmCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveLemburVerifikasiSdm(vo); if (null != result) @@ -4268,7 +4104,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-perhitungan-uang-lembur", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUangLembur(@Valid @RequestBody Set vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveUangLembur(vo); if (null != result) @@ -4290,15 +4126,15 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-poin-dokter/{idUnitKerja}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPoinDokter(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("periode") String periode, HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.getIndekKinerjaKuantitasPerUnitKerja(periode, idUnitKerja); + List> result = indekKinerjaService.getIndekKinerjaKuantitasPerUnitKerja(periode, + idUnitKerja); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/menangguhkan-permohonan-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -4340,7 +4176,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage()); @@ -4359,7 +4195,7 @@ public class SdmController extends LocaleController { @RequestParam(value = "take", required = false, defaultValue = "5") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "namaLengkap") String sort, @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "nama", required = false) String nama, @RequestParam(value = "jenisPermohonan", required = false) String jenisPermohonan, @RequestParam(value = "statusPermohonan", required = false) Integer statusPermohonan, @@ -4377,7 +4213,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage()); @@ -4392,7 +4228,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-jatah-cuti-dan-izin", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveJatahCutiDanIzin(@Valid @RequestBody KelompokShiftKerjaCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = servicePermohonanStatus.setJatahCutiRecursive(vo); if (null != result) @@ -4413,7 +4249,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-jatah-cuti-dan-izin-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveJatahCutiDanIzinPegawai(@Valid @RequestBody JatahCutiDanIzinVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = servicePermohonanStatus.setJatahCutiPegawaiRecursive(vo); if (null != result) @@ -4434,7 +4270,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-mapping-pegawai-to-atasan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveMappingPegawaiToJabatan( - @Valid @RequestBody List vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody List vo, HttpServletRequest request) { try { Map result = mappingPegawaiToAtasanService.saveMappingPegawaiToAtasan(vo); if (null != result) @@ -4456,49 +4292,45 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-pegawai-bawahan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaibawahan(@PathVariable("id") Integer id, HttpServletRequest request) { - List> result = null; try { - result = mappingPegawaiToAtasanService.getPegawaibawahan(id); + List> result = mappingPegawaiToAtasanService.getPegawaibawahan(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-mapping-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getMappingPegawai(HttpServletRequest request) { - List> result = null; try { - result = mappingPegawaiToAtasanService.getMappingpegawai(); + List> result = mappingPegawaiToAtasanService.getMappingpegawai(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-atasan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaiAtasan(@PathVariable("id") Integer id, HttpServletRequest request) { - List> result = null; try { - result = mappingPegawaiToAtasanService.getPegawaiAtasan(id); + List> result = mappingPegawaiToAtasanService.getPegawaiAtasan(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-atasan-langsung-as-pejabat-penilai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAtasanLangsungAsPejabatPenilai( - @RequestParam(value = "idAtasanLangsung", required = true) Integer idAtasanLangsung, - HttpServletRequest request) { - List> result = new ArrayList>(); + @RequestParam(value = "idAtasanLangsung") Integer idAtasanLangsung, HttpServletRequest request) { + List> result = new ArrayList<>(); try { Map data = mappingPegawaiToAtasanService .findAtasanLangsungAsPejabatPenilai(idAtasanLangsung); @@ -4506,14 +4338,14 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-rincian-kegiatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatan(@Valid @RequestBody RincianKegiatanVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasService.saveRincianKegiatan(vo); if (null != result) @@ -4534,7 +4366,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-map-rincian-kegiatan-to-uraian-tugas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatanToUraianTugas(@Valid @RequestBody UraianTugasMVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasService.saveUraianTugasNew(vo); if (null != result) @@ -4555,7 +4387,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/rekam-uraian-rincian-kegiatan-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRekamUraianRincianKegiatan( - @Valid @RequestBody RekamUraianRincianKegiatanVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody RekamUraianRincianKegiatanVO vo, HttpServletRequest request) { try { Map result = rekamUraianRincianKegiatanService.saveUraianRincianKegiatan(vo); if (null != result) @@ -4576,7 +4408,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-acuan-indeks-iki", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveAcuanIndeksIKI(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = indekKinerjaService.saveTabelAcuanIndeksIKI(vo); if (null != result) @@ -4597,60 +4429,56 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-acuan-iki", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllAcuan(HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.findAcuanIndeksIKI(); + List> result = indekKinerjaService.findAcuanIndeksIKI(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-indeks-iki/{nilai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getIndeksIKI(@PathVariable("nilai") Double nilai, HttpServletRequest request) { - Double result = 0.0; try { - result = indekKinerjaService.getIndeksIKI(nilai); + Double result = indekKinerjaService.getIndeksIKI(nilai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-uraian-tugas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllUT(HttpServletRequest request) { - List> result = null; try { - result = uraianTugasTransaksiService.findAllUraianTugas(); + List> result = uraianTugasTransaksiService.findAllUraianTugas(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian-kerja-by-jabatan/{idJabatan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerjaByJabatan( @PathVariable("idJabatan") Integer idJabatan, HttpServletRequest request) { - List> result = null; try { - result = uraianTugasTransaksiService.getUraianTugasByJabatan(idJabatan); + List> result = uraianTugasTransaksiService.getUraianTugasByJabatan(idJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-unit-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatan(@Valid @RequestBody UnitKerjaPegawaiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = unitKerjaPegawaiService.saveUnitkerja(vo); if (null != result) @@ -4671,34 +4499,32 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllUnitKerja(HttpServletRequest request) { - List result = null; try { - result = unitKerjaPegawaiService.getAllUnitKerja(); + List result = unitKerjaPegawaiService.getAllUnitKerja(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-unit-kerja-by-name/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUnitKerjaByName(@PathVariable("name") String name, HttpServletRequest request) { - List result = null; try { - result = unitKerjaPegawaiService.getUnitKerjaByName(name); + List result = unitKerjaPegawaiService.getUnitKerjaByName(name); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-habsen-manual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveHabsenManual(@Valid @RequestBody MonitoringAbsenCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveAbsenManual(vo); if (null != result) @@ -4719,7 +4545,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-sub-unit-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveSubUnitKerja(@Valid @RequestBody SubUnitKerjaPegawaiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = unitKerjaPegawaiService.saveSubUnitkerja(vo); if (null != result) @@ -4740,72 +4566,67 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-sub-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllSubUnitKerja(HttpServletRequest request) { - List> result = null; try { - result = unitKerjaPegawaiService.getAllSubUnitKerja(); + List> result = unitKerjaPegawaiService.getAllSubUnitKerja(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getSubunitKerjaByUnitKerja( - @RequestParam(value = "idUnitKerjaPegawai", required = true) Integer idUnitKerjaPegawai, - HttpServletRequest request) { - List> result = null; + @RequestParam(value = "idUnitKerjaPegawai") Integer idUnitKerjaPegawai, HttpServletRequest request) { try { - result = unitKerjaPegawaiService.getAllSubunitKerjaByUnitKerja(idUnitKerjaPegawai); + List> result = unitKerjaPegawaiService + .getAllSubunitKerjaByUnitKerja(idUnitKerjaPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-sub-unit-kerja-by-name/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getSubUnitKerjaByName(@PathVariable("name") String name, HttpServletRequest request) { - List> result = null; try { - result = unitKerjaPegawaiService.getSubUnitKerjaByName(name); + List> result = unitKerjaPegawaiService.getSubUnitKerjaByName(name); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getSubUnitKerjaByUnitKerja(@PathVariable("id") Integer id, HttpServletRequest request) { - List> result = null; try { - result = unitKerjaPegawaiService.getAllSubUnitKerjaByUnitKerja(id); + List> result = unitKerjaPegawaiService.getAllSubUnitKerjaByUnitKerja(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-habsen-manual/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getHabsenManual(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = null; try { - result = monitoringAbsenService.getByLoc_Code(idPegawai); + List> result = monitoringAbsenService.getByLoc_Code(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-tindakan-dokter-rescored/{month}/{idPegawai}/{idAlternatif}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -4820,7 +4641,6 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } catch (Exception e) { - e.printStackTrace(); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -4835,7 +4655,6 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } catch (Exception e) { - e.printStackTrace(); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -4852,7 +4671,6 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } catch (Exception e) { - e.printStackTrace(); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -4868,7 +4686,6 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } catch (Exception e) { - e.printStackTrace(); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -4884,7 +4701,6 @@ public class SdmController extends LocaleController { return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } catch (Exception e) { - e.printStackTrace(); return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } } @@ -4893,86 +4709,78 @@ public class SdmController extends LocaleController { public ResponseEntity>> getDetailPasien(HttpServletRequest request, @PathVariable("idProduk") Integer idProduk, @PathVariable("idKelompokPasien") Integer idKelompokPasien, @PathVariable("idKelas") Integer idKelas, @PathVariable("tgl") String tgl, @PathVariable("ffs") Boolean ffs, - @PathVariable("idPegawai") Integer idPegawai, - @RequestParam(value = "diskon", required = true) Double diskon, - @RequestParam(value = "statusDiskon", required = true) Integer statusDiskon) { - List> result = null; + @PathVariable("idPegawai") Integer idPegawai, @RequestParam(value = "diskon") Double diskon, + @RequestParam(value = "statusDiskon") Integer statusDiskon) { try { - result = indekKinerjaService.findPatientDetailForEveryTindakanReview(idProduk, idKelompokPasien, idKelas, idPegawai, tgl, ffs, - diskon, statusDiskon); + List> result = indekKinerjaService.findPatientDetailForEveryTindakanReview(idProduk, + idKelompokPasien, idKelas, idPegawai, tgl, ffs, diskon, statusDiskon); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-pasien-ffs/{idProduk}/{idKelas}/{idKomponenHarga}/{idPegawai}/{tgl}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailPasienFfs(HttpServletRequest request, @PathVariable("idProduk") Integer idProduk, @PathVariable("idKelas") Integer idKelas, @PathVariable("idKomponenHarga") Integer idKomponenHarga, @PathVariable("tgl") String tgl, - @PathVariable("idPegawai") Integer idPegawai, - @RequestParam(value = "diskon", required = true) Double diskon, - @RequestParam(value = "statusDiskon", required = true) Integer statusDiskon) { - List> result = null; + @PathVariable("idPegawai") Integer idPegawai, @RequestParam(value = "diskon") Double diskon, + @RequestParam(value = "statusDiskon") Integer statusDiskon) { try { - result = pendapatanService.getDetailFeeForServiceDokter(idProduk, idKelas, idKomponenHarga, idPegawai, tgl, - diskon, statusDiskon); + List> result = pendapatanService.getDetailFeeForServiceDokter(idProduk, idKelas, + idKomponenHarga, idPegawai, tgl, diskon, statusDiskon); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-kelompok-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllKelompokJabatan(HttpServletRequest request) { - List> result = null; try { - result = jabatanService.getKelompokJabatan(); + List> result = jabatanService.getKelompokJabatan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-jabatan-by-jenis-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanByJenisJabatan(HttpServletRequest request, - @RequestParam(value = "idJenisJabatan", required = true) Integer idJenisJabatan) { - List> result = null; + @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan) { try { - result = jabatanService.findModelJabatan(idJenisJabatan); + List> result = jabatanService.findModelJabatan(idJenisJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-jabatan-by-jenis-dan-unit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJabatanByJenisDanUnitKerja(HttpServletRequest request, - @RequestParam(value = "jenisJabatanId", required = true) Integer idJenisJabatan, - @RequestParam(value = "unitKerjaId", required = true) Integer idUnitKerja) { - List> result = new ArrayList<>(); + @RequestParam(value = "jenisJabatanId") Integer idJenisJabatan, + @RequestParam(value = "unitKerjaId") Integer idUnitKerja) { try { - result = jabatanService.findModelJabatan(idJenisJabatan, idUnitKerja); + List> result = jabatanService.findModelJabatan(idJenisJabatan, idUnitKerja); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-master-kelompok-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody KelompokJabatanVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = jabatanService.saveKelompokJabatan(vo); if (null != result) @@ -4993,59 +4801,55 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-kedudukan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllKedudukan(HttpServletRequest request) { - List> result = null; try { - result = kedudukanService.getKedudukanByStatusEnabled(); + List> result = kedudukanService.getKedudukanByStatusEnabled(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-kategoriPegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllategoriPegawai(HttpServletRequest request) { - Map result = new HashMap<>(); try { - result = kategoriPegawaiService.findAlls(); + Map result = kategoriPegawaiService.findAlls(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-golongan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllGolongan(HttpServletRequest request) { - List> result = null; try { - result = GolonganService.getKedudukanByStatusEnabled(); + List> result = GolonganService.getKedudukanByStatusEnabled(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-hari-libur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllHariLibur(HttpServletRequest request) { - List> result = null; try { - result = indekKinerjaService.getAllMapKalenderToHariLibur(); + List> result = indekKinerjaService.getAllMapKalenderToHariLibur(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-hari-libur", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveHariLibur(@Valid @RequestBody MapKalenderToHariLiburVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = indekKinerjaService.saveMapKalenderToHariLibur(vo); if (null != result) @@ -5066,61 +4870,57 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-grade/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getGrade(@PathVariable("id") Integer id, HttpServletRequest request) { - Map result = null; try { - result = kelompokJabatanService.getNilaiKelompokJabatan(id); + Map result = kelompokJabatanService.getNilaiKelompokJabatan(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-kelompok-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailkelompokJabatan(HttpServletRequest request) { - List> result = null; try { - result = kelompokJabatanService.getAllByStatusEnabled(); + List> result = kelompokJabatanService.getAllByStatusEnabled(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-history-pegawai/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getDetailHistoryPegawai(@PathVariable("noRec") String noRec, HttpServletRequest request) { - RekamDataPegawaiCustomVO result = null; try { - result = rekamDataPegawaiService.getDetailPerubahan(noRec); + RekamDataPegawaiCustomVO result = rekamDataPegawaiService.getDetailPerubahan(noRec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-history-pegawai/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListHistoryPegawai(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = new HashMap<>(); try { - result = rekamDataPegawaiService.getListHistoryDatapegawai(idPegawai); + Map result = rekamDataPegawaiService.getListHistoryDatapegawai(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-uraian-tugas-flexible", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugasFlexible(@Valid @RequestBody UraianTugasFlexibleVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveUraianTugasFlexible(vo); if (null != result) @@ -5142,106 +4942,100 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-uraian-tugas-flexible-by-date/{idPegawai}/{date}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugas(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("date") String date, HttpServletRequest request) { - List> result = null; try { - result = uraianTugasTransaksiService.findAllUraianTugasToday(idPegawai, date); + List> result = uraianTugasTransaksiService.findAllUraianTugasToday(idPegawai, date); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-uraian-tugas-verified-monthly/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugasMonthly( @PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { - List> result = null; try { - result = uraianTugasTransaksiService.findAllUraianTugasMonthly(idPegawai, periode); + List> result = uraianTugasTransaksiService.findAllUraianTugasMonthly(idPegawai, + periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-uraian-tugas-bawahan/{idAtasan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugasBawahan( @PathVariable("idAtasan") Integer idAtasan, HttpServletRequest request) { - List> result = null; try { - result = uraianTugasTransaksiService.findAllUraianTugasBawahan(idAtasan); + List> result = uraianTugasTransaksiService.findAllUraianTugasBawahan(idAtasan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-jatah-cuti/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListJatahCuti(HttpServletRequest request) { - List> result = null; try { - result = servicePermohonanStatus.getAllDataCuti(); + List> result = servicePermohonanStatus.getAllDataCuti(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-jatah-cuti-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListJatahCuti( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, HttpServletRequest request) { - List> result = null; + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { - result = servicePermohonanStatus.getAllDataCuti(idPegawai); + List> result = servicePermohonanStatus.getAllDataCuti(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-penandatangan-surat-izin-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListPenandaTanganSuratIzinCuti(HttpServletRequest request) { - List> result = null; try { - result = monitoringAbsenService.findListPenandaTangan(); + List> result = monitoringAbsenService.findListPenandaTangan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-dataPegawai-rev", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDataPegawaiRevMonitoring( - @RequestParam(value = "idUnitKerja", required = true) Integer idUnitKerja, - @RequestParam(value = "idSubUnitKerja", required = true) Integer idSubUnitKerja, - @RequestParam(value = "idPegawaiLogin", required = true) Integer idPegawaiLogin, - HttpServletRequest request) { - List> result = new ArrayList<>(); + @RequestParam(value = "idUnitKerja") Integer idUnitKerja, + @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja, + @RequestParam(value = "idPegawaiLogin") Integer idPegawaiLogin, HttpServletRequest request) { try { - result = monitoringAbsenService.findDataPegawaiRev(idUnitKerja, idSubUnitKerja, idPegawaiLogin); + List> result = monitoringAbsenService.findDataPegawaiRev(idUnitKerja, idSubUnitKerja, + idPegawaiLogin); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-id-kalender", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getIdKalender( - @RequestParam(value = "tanggal", required = true) String tanggal, HttpServletRequest request) { + public ResponseEntity>> getIdKalender(@RequestParam(value = "tanggal") String tanggal, + HttpServletRequest request) { List> result = new ArrayList<>(); try { Map map = new HashMap<>(); @@ -5250,29 +5044,27 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-mapping-hari-libur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getMappingHariLibur( - @RequestParam(value = "tahun", required = true) String tahun, HttpServletRequest request) { - List> result = new ArrayList<>(); + public ResponseEntity>> getMappingHariLibur(@RequestParam(value = "tahun") String tahun, + HttpServletRequest request) { try { - result = pegawaiJadwalKerjaService.findMappingHariLibur(tahun); + List> result = pegawaiJadwalKerjaService.findMappingHariLibur(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/non-shift-auto-jadwal-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> autoSaveJadwalKerjaNonShift( - @RequestParam(value = "idSubUnitKerja", required = true) Integer idSubUnitKerja, - HttpServletRequest request) { + @RequestParam(value = "idSubUnitKerja") Integer idSubUnitKerja, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaService.autoSaveJadwalKerjaNonShift(); if (null != result) @@ -5293,8 +5085,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-riwayat-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRiwayatJabatan(@RequestParam(value = "idPegawai") Integer idPegawai, - @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan, HttpServletRequest request) - throws ParseException { + @RequestParam(value = "idJenisJabatan") Integer idJenisJabatan, HttpServletRequest request) { Map result = new HashMap<>(); try { List> riwayatJabatanByPegawai = riwayatJabatanService.findRiwayatJabatan(idPegawai, @@ -5307,14 +5098,14 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-data-riwayat-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataRiwayatJabatan( - @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) throws ParseException { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { Map result = new HashMap<>(); try { List> riwayatJabatanByPegawai = riwayatJabatanService.findDataRiwayatJabatan(idPegawai); @@ -5322,14 +5113,14 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-data-riwayat-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataRiwayatPendidikan( - @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) throws ParseException { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { Map result = new HashMap<>(); try { List> riwayatPendidikanByPegawai = riwayatPendidikanService @@ -5338,7 +5129,7 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @@ -5425,9 +5216,9 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/delete-jadwal-dinas-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> deleteJadwalDinasPegawai(@Valid @RequestBody PegawaiJadwalKerjaVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map result = new HashMap(); + Map result = new HashMap<>(); pegawaiJadwalKerjaService.deletePegawaiJadwalKerja(vo.getId()); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -5446,8 +5237,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-jumlah-pengajuan-ketidakhadiran-diproses", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getJumlahCutiTahunanDiproses(HttpServletRequest request, - @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idPlan") Integer idPlan) - throws ParseException { + @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idPlan") Integer idPlan) { Map result = new HashMap<>(); try { Integer jumlahCutiTahunanDiproses = servicePermohonanStatus.countJumlahPengajuanDiprosesByPegawai(idPegawai, @@ -5461,7 +5251,7 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @@ -5469,7 +5259,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-jumlah-pengajuan-ketidakhadiran-diproses-edit", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getJumlahCutiTahunanDiproses(HttpServletRequest request, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "idPlan") Integer idPlan, - @RequestParam(value = "noPlanning") String noPlanning) throws ParseException { + @RequestParam(value = "noPlanning") String noPlanning) { Map result = new HashMap<>(); try { Integer jumlahCutiTahunanDiproses = servicePermohonanStatus.countJumlahPengajuanDiprosesByPegawai(idPegawai, @@ -5483,7 +5273,7 @@ public class SdmController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @@ -5546,7 +5336,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-daftar-ruangan", method = RequestMethod.GET) public ResponseEntity>> getListRuanganDepartemen(HttpServletRequest request, - @RequestParam(value = "departemenId", required = true) Integer departemenId) { + @RequestParam(value = "departemenId") Integer departemenId) { try { List> result = ruanganService.findListRuanganDepartemen(departemenId); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -5565,7 +5355,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-jadwal-pegawai", method = RequestMethod.GET) public ResponseEntity> getJadwalPegawai(HttpServletRequest request, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai) { + @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = absensiPegawaiService.findJadwalPegawai(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -5584,7 +5374,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-histori-presensi-pegawai", method = RequestMethod.GET) public ResponseEntity>> getHistoriPresensiPegawai(HttpServletRequest request, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai) { + @RequestParam(value = "idPegawai") Integer idPegawai) { try { List> result = absensiPegawaiService.findHistoriPresensi(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -5604,7 +5394,7 @@ public class SdmController extends LocaleController { public static String getClientIpAddress(HttpServletRequest request) { for (String header : Master.IP_HEADER_CANDIDATES) { String ip = request.getHeader(header); - if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) { + if (ip != null && !ip.isEmpty() && !"unknown".equalsIgnoreCase(ip)) { return ip; } } @@ -5625,12 +5415,6 @@ public class SdmController extends LocaleController { logAccService.putToLog(vo); } return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - logAccService.putToLog(vo); - - LOGGER.error("Got exception {} when save presensi pegawai", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { logAccService.putToLog(vo); @@ -5665,8 +5449,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-rincian-kegiatan-pegawai", method = RequestMethod.GET) public ResponseEntity> getListRincianKegiatan(HttpServletRequest request, - @RequestParam(value = "idJabatan", required = true) Integer idJabatan, - @RequestParam(value = "idPelaksanaanTugas", required = true) Integer idPelaksanaanTugas) { + @RequestParam(value = "idJabatan") Integer idJabatan, + @RequestParam(value = "idPelaksanaanTugas") Integer idPelaksanaanTugas) { try { Map result = uraianTugasService.getRincianKegiatanPegawai(idJabatan, idPelaksanaanTugas); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -5684,9 +5468,9 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/generate-excel", method = RequestMethod.GET) - public void generateExcel(@RequestParam(value = "bulan", required = true) String bulan, - @RequestParam(value = "idUnitKerja", required = true) Integer idUnitKerja, - @RequestParam(value = "idSubunitKerja", required = true) Integer idSubunitKerja, HttpServletRequest request, + public void generateExcel(@RequestParam(value = "bulan") String bulan, + @RequestParam(value = "idUnitKerja") Integer idUnitKerja, + @RequestParam(value = "idSubunitKerja") Integer idSubunitKerja, HttpServletRequest request, HttpServletResponse response) { try { String fileNamePath = pegawaiJadwalKerjaService.writeExcelPegawaiJadwalKerja(bulan, idUnitKerja, @@ -5701,9 +5485,9 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/download-jadwal", method = RequestMethod.GET) - public ResponseEntity downloadJadwal(@RequestParam(value = "filename", required = true) String fileName, + public ResponseEntity downloadJadwal(@RequestParam(value = "filename") String fileName, HttpServletRequest request) { - Resource resource = null; + Resource resource; if (CommonUtil.isNotNullOrEmpty(fileName)) { try { resource = pegawaiJadwalKerjaService.loadFileAsResource(fileName); @@ -5713,7 +5497,7 @@ public class SdmController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } - String contentType = null; + String contentType; try { contentType = request.getServletContext().getMimeType(resource.getFile().getAbsolutePath()); } catch (Exception e) { @@ -5980,7 +5764,7 @@ public class SdmController extends LocaleController { public ResponseEntity saveMapJabatanProfesi(HttpServletRequest request, @Valid @RequestBody MapJabatanProfesiVO vo) { try { - MapJabatanProfesiVO result = new MapJabatanProfesiVO(); + MapJabatanProfesiVO result; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { result = mapJabatanProfesiService.update(vo); } else { @@ -6008,7 +5792,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/delete-map-jabatan-profesi", method = RequestMethod.POST) public ResponseEntity deleteMapJabatanProfesi(HttpServletRequest request, - @RequestParam(value = "id", required = true) Integer id) { + @RequestParam(value = "id") Integer id) { try { Boolean result = mapJabatanProfesiService.delete(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -6046,7 +5830,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-daftar-profesi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDaftarProfesi(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai, + @RequestParam(value = "pegawaiId") Integer idPegawai, @RequestParam(value = "jenisId", required = false) Short idJenis) { try { List> result = profesiService.findByStatus(idPegawai, idJenis); @@ -6067,7 +5851,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-akses-logbook-skor", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAksesLogbookSkor(HttpServletRequest request, - @RequestParam(value = "pegawaiId", required = true) Integer idPegawai) { + @RequestParam(value = "pegawaiId") Integer idPegawai) { try { Map result = jabatanService.findAksesLogbookSkoring(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index 233ecaf0..b570e6bb 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -1,29 +1,5 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; import com.jasamedika.medifirst2000.controller.base.LocaleController; @@ -35,183 +11,24 @@ import com.jasamedika.medifirst2000.entities.MapUraianTugasToRincianKegiatan; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AbsensiPegawaiService; -import com.jasamedika.medifirst2000.service.AsuransiNakerService; -import com.jasamedika.medifirst2000.service.AturanPeminjamanService; -import com.jasamedika.medifirst2000.service.BerkasLamaranService; -import com.jasamedika.medifirst2000.service.BibliographyService; -import com.jasamedika.medifirst2000.service.CustomIndexKerjaService; -import com.jasamedika.medifirst2000.service.DaftarKeanggotaanService; -import com.jasamedika.medifirst2000.service.DataKeluargaService; -import com.jasamedika.medifirst2000.service.DataPegawaiService; -import com.jasamedika.medifirst2000.service.DegreeService; -import com.jasamedika.medifirst2000.service.EvaluasiJabatanService; -import com.jasamedika.medifirst2000.service.FakultasService; -import com.jasamedika.medifirst2000.service.GajiPokokService; -import com.jasamedika.medifirst2000.service.GolonganService; -import com.jasamedika.medifirst2000.service.IndekKinerjaService; -import com.jasamedika.medifirst2000.service.InformasiDaftarGajiService; -import com.jasamedika.medifirst2000.service.InputDaftarPaketPelatihanService; -import com.jasamedika.medifirst2000.service.InputDaftarPaketSeminarService; -import com.jasamedika.medifirst2000.service.InstitusiPendidikanService; -import com.jasamedika.medifirst2000.service.IsianPelamarService; -import com.jasamedika.medifirst2000.service.JabatanService; -import com.jasamedika.medifirst2000.service.JadwalDokterService; -import com.jasamedika.medifirst2000.service.JadwalOrientasiService; -import com.jasamedika.medifirst2000.service.JenisCutiService; -import com.jasamedika.medifirst2000.service.JenisGajiService; -import com.jasamedika.medifirst2000.service.JenisHonorService; -import com.jasamedika.medifirst2000.service.JenisKompetensiService; -import com.jasamedika.medifirst2000.service.JenisPnsService; -import com.jasamedika.medifirst2000.service.JenisSkService; -import com.jasamedika.medifirst2000.service.JurusanPeminatanService; -import com.jasamedika.medifirst2000.service.KategoriPegawaiService; -import com.jasamedika.medifirst2000.service.KategoryTugasService; -import com.jasamedika.medifirst2000.service.KedudukanService; -import com.jasamedika.medifirst2000.service.KelompokKompetensiService; -import com.jasamedika.medifirst2000.service.KompetensiService; -import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService; -import com.jasamedika.medifirst2000.service.MasterEvaluasiJabatanService; -import com.jasamedika.medifirst2000.service.MasterHonorTimService; -import com.jasamedika.medifirst2000.service.MasterJenisSantunanService; -import com.jasamedika.medifirst2000.service.MonitoringAbsenService; -import com.jasamedika.medifirst2000.service.MutasiPegawaiService; -import com.jasamedika.medifirst2000.service.NamaAsuransiService; -import com.jasamedika.medifirst2000.service.NamaPegawaiService; -import com.jasamedika.medifirst2000.service.NamaPembimbingService; -import com.jasamedika.medifirst2000.service.NilaiKelompokJabatanService; -import com.jasamedika.medifirst2000.service.PegawaiJadwalKerjaService; -import com.jasamedika.medifirst2000.service.PegawaiMutasiSanksiResignService; -import com.jasamedika.medifirst2000.service.PekerjaanService; -import com.jasamedika.medifirst2000.service.PengembalianService; -import com.jasamedika.medifirst2000.service.PerhitunganHonorTimPegawaiService; -import com.jasamedika.medifirst2000.service.PerhitunganPremiBPJSKesehatanService; -import com.jasamedika.medifirst2000.service.PerhitunganPremiBPJSKetenagaKerjaanService; -import com.jasamedika.medifirst2000.service.PerhitunganSantunanPegawaiMeninggalDuniaService; -import com.jasamedika.medifirst2000.service.PerhitunganUangLemburPegawaiService; -import com.jasamedika.medifirst2000.service.PeriodePengajarService; -import com.jasamedika.medifirst2000.service.PeriodePinjamanService; -import com.jasamedika.medifirst2000.service.PermohonanCutiPegawaiService; -import com.jasamedika.medifirst2000.service.PermohonanStatusPegawaiService; -import com.jasamedika.medifirst2000.service.PernelitianEksternalService; -import com.jasamedika.medifirst2000.service.PesertaDidikService; -import com.jasamedika.medifirst2000.service.PosisiLamaranService; -import com.jasamedika.medifirst2000.service.ProgramPendidikanService; -import com.jasamedika.medifirst2000.service.ProgramPengajaranService; -import com.jasamedika.medifirst2000.service.RangeKmkService; -import com.jasamedika.medifirst2000.service.RegistrasiKeanggotaanService; -import com.jasamedika.medifirst2000.service.RekamDataPegawaiService; -import com.jasamedika.medifirst2000.service.ReservasiService; -import com.jasamedika.medifirst2000.service.RiwayatPenilaianKompetensiPegawaiService; -import com.jasamedika.medifirst2000.service.ShiftKerjaService; -import com.jasamedika.medifirst2000.service.SimulasiPendapatanService; -import com.jasamedika.medifirst2000.service.StatusKawinService; -import com.jasamedika.medifirst2000.service.StatusMeninggalDuniaService; -import com.jasamedika.medifirst2000.service.StatusPegawaiService; -import com.jasamedika.medifirst2000.service.TahunUmrService; -import com.jasamedika.medifirst2000.service.TanggunganService; -import com.jasamedika.medifirst2000.service.TipeKeanggotaanService; -import com.jasamedika.medifirst2000.service.TipeKoleksiService; -import com.jasamedika.medifirst2000.service.UnitKerjaPegawaiService; -import com.jasamedika.medifirst2000.service.UraianTugasService; -import com.jasamedika.medifirst2000.service.UraianTugasTransaksiService; +import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AbsensiPegawaiVO; -import com.jasamedika.medifirst2000.vo.AkunVO; -import com.jasamedika.medifirst2000.vo.AsuransiNakerVO; -import com.jasamedika.medifirst2000.vo.AturanPeminjamanVO; -import com.jasamedika.medifirst2000.vo.BerkasLamaranVO; -import com.jasamedika.medifirst2000.vo.BibliographyVO; -import com.jasamedika.medifirst2000.vo.CustomIndexKerjaVO; -import com.jasamedika.medifirst2000.vo.DaftarKeanggotaanVO; -import com.jasamedika.medifirst2000.vo.DataKeluargaVO; -import com.jasamedika.medifirst2000.vo.DataPegawaiVO; -import com.jasamedika.medifirst2000.vo.DegreeVO; -import com.jasamedika.medifirst2000.vo.EvaluasiJabatanVO; -import com.jasamedika.medifirst2000.vo.FaktorEvaluasiVO; -import com.jasamedika.medifirst2000.vo.FakultasVO; -import com.jasamedika.medifirst2000.vo.GajiPokokVO; -import com.jasamedika.medifirst2000.vo.GolonganVO; -import com.jasamedika.medifirst2000.vo.IndekKinerjaVO; -import com.jasamedika.medifirst2000.vo.IndeksKinerjaIndividuCustomVO; -import com.jasamedika.medifirst2000.vo.IndeksKinerjaIndividuVO; -import com.jasamedika.medifirst2000.vo.InputDaftarPaketPelatihanVO; -import com.jasamedika.medifirst2000.vo.InputDaftarPaketSeminarVO; -import com.jasamedika.medifirst2000.vo.InputLemburSdmCustomVO; -import com.jasamedika.medifirst2000.vo.InstitusiPendidikanVO; -import com.jasamedika.medifirst2000.vo.IsianPelamarVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.JadwalOrientasiVO; -import com.jasamedika.medifirst2000.vo.JatahCutiDanIzinVO; -import com.jasamedika.medifirst2000.vo.JenisCutiVO; -import com.jasamedika.medifirst2000.vo.JenisGajiVO; -import com.jasamedika.medifirst2000.vo.JenisHonorVO; -import com.jasamedika.medifirst2000.vo.JenisKompetensiVO; -import com.jasamedika.medifirst2000.vo.JenisPnsVO; -import com.jasamedika.medifirst2000.vo.JenisSkVO; -import com.jasamedika.medifirst2000.vo.JurusanPeminatanVO; -import com.jasamedika.medifirst2000.vo.KategoryTugasVO; -import com.jasamedika.medifirst2000.vo.KedudukanVO; -import com.jasamedika.medifirst2000.vo.KelompokJabatanVO; -import com.jasamedika.medifirst2000.vo.KelompokKompetensiVO; -import com.jasamedika.medifirst2000.vo.KelompokShiftKerjaCustomVO; -import com.jasamedika.medifirst2000.vo.KompetensiVO; -import com.jasamedika.medifirst2000.vo.MapKalenderToHariLiburVO; -import com.jasamedika.medifirst2000.vo.MappingPegawaiToAtasanVO; -import com.jasamedika.medifirst2000.vo.MasterEvaluasiJabatanVO; -import com.jasamedika.medifirst2000.vo.MasterHonorTimVO; -import com.jasamedika.medifirst2000.vo.MasterJenisSantunanVO; -import com.jasamedika.medifirst2000.vo.MonitoringAbsenCustomVO; -import com.jasamedika.medifirst2000.vo.MutasiPegawaiVO; -import com.jasamedika.medifirst2000.vo.NamaAsuransiVO; -import com.jasamedika.medifirst2000.vo.NamaPegawaiVO; -import com.jasamedika.medifirst2000.vo.NamaPembimbingVO; -import com.jasamedika.medifirst2000.vo.NilaiKelompokJabatanVO; -import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaCustomVO; -import com.jasamedika.medifirst2000.vo.PekerjaanVO; -import com.jasamedika.medifirst2000.vo.PerhitunganAbkVO; -import com.jasamedika.medifirst2000.vo.PerhitunganHonorTimPegawaiVO; -import com.jasamedika.medifirst2000.vo.PerhitunganPremiBPJSKesehatanVO; -import com.jasamedika.medifirst2000.vo.PerhitunganPremiBPJSKetenagaKerjaanVO; -import com.jasamedika.medifirst2000.vo.PerhitunganSantunanPegawaiMeninggalDuniaVO; -import com.jasamedika.medifirst2000.vo.PerhitunganUangLemburPegawaiVO; -import com.jasamedika.medifirst2000.vo.PeriodePengajarVO; -import com.jasamedika.medifirst2000.vo.PeriodePinjamanVO; -import com.jasamedika.medifirst2000.vo.PermohonanCutiPegawaiVO; -import com.jasamedika.medifirst2000.vo.PernelitianEksternalVO; -/*import com.jasamedika.medifirst2000.vo.PesertaDidikVO;*/ -import com.jasamedika.medifirst2000.vo.PlanningPegawaiMuSaReVO; -import com.jasamedika.medifirst2000.vo.PlanningPegawaiStatusVO; -import com.jasamedika.medifirst2000.vo.PosisiLamaranVO; -import com.jasamedika.medifirst2000.vo.ProgramPendidikanVO; -import com.jasamedika.medifirst2000.vo.ProgramPengajaranVO; -import com.jasamedika.medifirst2000.vo.RangeKmkVO; -import com.jasamedika.medifirst2000.vo.RegistrasiKeanggotaanVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiCustomVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; -import com.jasamedika.medifirst2000.vo.ReservasiVO; -import com.jasamedika.medifirst2000.vo.RincianKegiatanVO; -import com.jasamedika.medifirst2000.vo.SaveAbsenVO; -import com.jasamedika.medifirst2000.vo.ShiftKerjaVO; -import com.jasamedika.medifirst2000.vo.SimulasiPendapatanVO; -import com.jasamedika.medifirst2000.vo.StatusKawinVO; -import com.jasamedika.medifirst2000.vo.StatusMeninggalDuniaVO; -import com.jasamedika.medifirst2000.vo.StatusPegawaiVO; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; -import com.jasamedika.medifirst2000.vo.SubUnitKerjaPegawaiVO; -import com.jasamedika.medifirst2000.vo.TabelAcuanIndeksIKIVO; -import com.jasamedika.medifirst2000.vo.TahunUmrVO; -import com.jasamedika.medifirst2000.vo.TanggunganVO; -import com.jasamedika.medifirst2000.vo.TipeKeanggotaanVO; -import com.jasamedika.medifirst2000.vo.TipeKoleksiVO; -import com.jasamedika.medifirst2000.vo.UangLemburVO; -import com.jasamedika.medifirst2000.vo.UnitKerjaPegawaiVO; -import com.jasamedika.medifirst2000.vo.UploadExcelVO; -import com.jasamedika.medifirst2000.vo.UraianTugasCustomVO; -import com.jasamedika.medifirst2000.vo.UraianTugasFlexibleVO; -import com.jasamedika.medifirst2000.vo.UraianTugasMVO; -import com.jasamedika.medifirst2000.vo.UraianTugasVO; +import com.jasamedika.medifirst2000.vo.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; +import java.util.Set; @RestController @RequestMapping("/sdm") @@ -249,10 +66,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-custom-uraian-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = customIndexKerjaService.saveCustomIndexKerja(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -274,25 +89,20 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-custom-uraian-kerja/{id}/{tanggal}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getCustomUraianKerja(@PathVariable("id") String id, @PathVariable("tanggal") String tanggal, HttpServletRequest request) { - Map result = null; try { - - result = customIndexKerjaService.findByPegawaiAndData(id, DateUtil.toDate(tanggal)); - + Map result = customIndexKerjaService.findByPegawaiAndData(id, DateUtil.toDate(tanggal)); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-berkas-lamaran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveBerkasLamaran(@Valid @RequestBody BerkasLamaranVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = berkasLamaranService.saveBerkasLamaran(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -314,18 +124,16 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-berkas-lamaran/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getsaveBerkasLamaran(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { if (nama.equals("-")) nama = ""; - result = berkasLamaranService.findByNamaPelamarNoRec(nama); - + Map result = berkasLamaranService.findByNamaPelamarNoRec(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -336,10 +144,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-reservasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveReservasi(@Valid @RequestBody ReservasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = reservasiService.saveReservasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -360,10 +166,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-pengembalian", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePengembalian(@Valid @RequestBody ReservasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = reservasiService.saveReservasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -387,13 +191,9 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/upload-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.ALL_VALUE) public ResponseEntity> uploadAbsen(@Valid @RequestBody UploadExcelVO fileInput, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - - String fileName = ""; - Map result = jadwalDokterService.uploadAbsensi(fileInput); - if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -416,16 +216,12 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveAbsen(@Valid @RequestBody SaveAbsenVO fileInput, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - - String fileName = ""; - Map result = null; for (AbsensiPegawaiVO absensiPegawaiVO : fileInput.getData()) { result = absensiPegawaiService.saveAbsensiPegawai(absensiPegawaiVO); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { @@ -444,46 +240,37 @@ public class SdmController extends LocaleController { public ResponseEntity> savejadwalAbsenPegawai(@PathVariable("idFinger") String idFinger, @PathVariable("tanggalMasuk") String tanggalMasuk, @PathVariable("tanggalKeluar") String tanggalKeluar, HttpServletRequest request) { - Map result = null; try { - - result = jadwalDokterService.saveJadwalPegawai(idFinger, DateUtil.toDate(tanggalMasuk), + Map result = jadwalDokterService.saveJadwalPegawai(idFinger, DateUtil.toDate(tanggalMasuk), DateUtil.toDate(tanggalKeluar)); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-reservasi-by-anggota/{norec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getReservasiByNoRec(@PathVariable("norec") String norec, HttpServletRequest request) { - Map result = null; try { - - result = reservasiService.findReservasiByAnggota(norec); - + Map result = reservasiService.findReservasiByAnggota(norec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-degree", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveDegree(@Valid @RequestBody DegreeVO vo, HttpServletRequest request) { try { Map result = degreeService.saveDegree(vo); - if (null != result) - ; mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when saveAkun", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -502,14 +289,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveNamaPembimbing(@Valid @RequestBody NamaPembimbingVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = namaPembimbingService.saveNamaPembimbing(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -529,14 +313,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveNamaAsuransi(@Valid @RequestBody NamaAsuransiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = namaAsuransiService.saveNamaAsuransi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -556,14 +337,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveKedudukan(@Valid @RequestBody KedudukanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = kedudukanService.saveKedudukan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -583,14 +361,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJurusanPeminatan(@Valid @RequestBody JurusanPeminatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = jurusanPeminatanService.saveJurusanPeminatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -610,14 +385,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJenisSk(@Valid @RequestBody JenisSkVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = jenisSkService.saveJenisSk(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -637,14 +409,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJenisPns(@Valid @RequestBody JenisPnsVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = jenisPnsService.saveJenisPns(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -664,14 +433,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJenisCuti(@Valid @RequestBody JenisCutiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = jenisCutiService.saveJenisCuti(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -691,14 +457,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJabatan(@Valid @RequestBody JabatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = jabatanService.saveJabatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -718,14 +481,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveInstitusiPendidikan(@Valid @RequestBody InstitusiPendidikanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = institusiPendidikanService.saveInstitusiPendidikan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -745,14 +505,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveFakultas(@Valid @RequestBody FakultasVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = fakultasService.saveFakultas(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -762,7 +519,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -772,14 +528,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveTipeKoleksi(@Valid @RequestBody TipeKoleksiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = tipeKoleksiService.saveTipeKoleksi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -789,7 +542,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -799,14 +551,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveTipeKeanggotaan(@Valid @RequestBody TipeKeanggotaanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = tipeKeanggotaanService.saveTipeKeanggotaan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -816,7 +565,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -826,14 +574,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveTanggungan(@Valid @RequestBody TanggunganVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = tanggunganService.saveTanggungan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -843,7 +588,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -853,14 +597,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveStatusPegawai(@Valid @RequestBody StatusPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = statusPegawaiService.saveStatusPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -870,7 +611,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -880,14 +620,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveStatusMeninggalDunia(@Valid @RequestBody StatusMeninggalDuniaVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = statusMeninggalDunia.saveStatusMeninggalDunia(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -897,7 +634,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -907,14 +643,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveStatusKawin(@Valid @RequestBody StatusKawinVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = statusKawinService.saveStatusKawin(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -924,7 +657,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -934,14 +666,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveProgramPengajaran(@Valid @RequestBody ProgramPengajaranVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = programPengajaranService.saveProgramPengajaran(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -951,7 +680,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -961,14 +689,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveProgramPendidikan(@Valid @RequestBody ProgramPendidikanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = programPendidikanService.saveProgramPendidikan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -978,7 +703,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -988,14 +712,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePosisiLamaran(@Valid @RequestBody PosisiLamaranVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = posisiLamaranService.savePosisiLamaran(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1005,7 +726,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1015,14 +735,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePeriodePinjaman(@Valid @RequestBody PeriodePinjamanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = periodePinjamanService.savePeriodePinjaman(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1032,7 +749,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1042,14 +758,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePekerjaan(@Valid @RequestBody PekerjaanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = pekerjaanService.savePekerjaan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1059,7 +772,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1069,14 +781,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveShiftKerja(@Valid @RequestBody ShiftKerjaVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = shiftKerjaService.saveShiftKerja(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1086,21 +795,17 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/delete-shift-kerja/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deleteShiftKerja(@RequestParam(value = "id", required = true) Integer id, + public ResponseEntity> deleteShiftKerja(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = shiftKerjaService.deleteShiftKerja(id); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1110,20 +815,16 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/get-shift-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getShiftKerja(HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = shiftKerjaService.findAll(); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1133,7 +834,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1143,14 +843,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveAturanPeminjaman(@Valid @RequestBody AturanPeminjamanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = aturanPeminjamanService.saveAturanPeminjaman(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1160,7 +857,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1170,14 +866,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveBibliography(@Valid @RequestBody BibliographyVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = bibliographyService.saveBibliography(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1187,26 +880,20 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/get-bibliography/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getBibliography(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = bibliographyService.findByName(nama); - + Map result = bibliographyService.findByName(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - // caun @Autowired private DaftarKeanggotaanService daftarKeanggotaanService; @@ -1215,7 +902,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveDaftarKeanggotaan(@Valid @RequestBody DaftarKeanggotaanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); Map result = daftarKeanggotaanService.saveDaftarKeanggotaan(vo); if (null != result) @@ -1242,14 +928,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveDataKeluarga(@Valid @RequestBody DataKeluargaVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = dataKeluargaService.saveDataKeluarga(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1259,7 +942,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/get-data-keluarga", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -1291,14 +973,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveDataPegawai(@Valid @RequestBody DataPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = dataPegawaiService.saveDataPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1308,7 +987,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1318,14 +996,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveMutasiPegawai(@Valid @RequestBody MutasiPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = mutasiPegawaiService.saveMutasiPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1335,41 +1010,8 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } - @Autowired - private PengembalianService pengembalianService; - - // @RequestMapping(value = "/save-pengembalian", method = - // RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes - // = MediaType.APPLICATION_JSON_VALUE) - // public ResponseEntity> savePengembalian(@Valid - // @RequestBody PengembalianVO vo, - // HttpServletRequest request) { - // try { - // SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - // - // Map result = pengembalianService.savePengembalian(vo); - // if (null != result) - // mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - // getMessage(MessageResource.LABEL_SUCCESS, request)); - // return RestUtil.getJsonResponse(result, HttpStatus.CREATED, - // mapHeaderMessage); - // - // } catch (ServiceVOException e) { - // LOGGER.error("Got exception {} when add Pasien", e.getMessage()); - // addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - // return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - // mapHeaderMessage); - // } catch (JpaSystemException jse) { - // LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); - // addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - // return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - // } - // - // } - @Autowired private PerhitunganPremiBPJSKesehatanService perhitunganPremiBPJSKesehatanService; @@ -1377,14 +1019,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePerhitunganPremiBPJSKesehatan( @Valid @RequestBody PerhitunganPremiBPJSKesehatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = perhitunganPremiBPJSKesehatanService.savePerhitunganPremiBPJSKesehatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1394,7 +1033,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1404,15 +1042,12 @@ public class SdmController extends LocaleController { public ResponseEntity> savePerhitunganPremiBPJSKetenagakerjaan( @Valid @RequestBody PerhitunganPremiBPJSKetenagaKerjaanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = perhitunganPremiBPJSKetenagakerjaanService .savePerhitunganPremiBPJSKetenagaKerjaan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1422,7 +1057,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1432,15 +1066,12 @@ public class SdmController extends LocaleController { public ResponseEntity> savePerhitunganSantunanPegawaiMeninggalDunia( @Valid @RequestBody PerhitunganSantunanPegawaiMeninggalDuniaVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = perhitunganSantunanPegawaiMeninggalDuniaService .savePerhitunganSantunanPegawaiMeninggalDunia(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1450,7 +1081,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1460,14 +1090,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePerhitunganUangLemburPegawai( @Valid @RequestBody PerhitunganUangLemburPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = perhitunganUangLemburPegawaiService.savePerhitunganUangLemburPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1487,14 +1114,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePeriodePengajar(@Valid @RequestBody PeriodePengajarVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = periodePengajarService.savePeriodePengajar(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1504,7 +1128,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1514,14 +1137,11 @@ public class SdmController extends LocaleController { public ResponseEntity> savePermohonanCutiPegawai(@Valid @RequestBody PermohonanCutiPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = permohonanCutiPegawaiService.savePermohonanCutiPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1531,12 +1151,8 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } - @Autowired - private PesertaDidikService pesertaDidikService; - /* * @RequestMapping(value = "/save-peserta-didik", method = * RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes @@ -1571,14 +1187,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveRegistrasiKeanggotaan(@Valid @RequestBody RegistrasiKeanggotaanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = registrasiKeanggotaanService.saveRegistrasiKeanggotaan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1588,28 +1201,21 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/get-registrasi-keanggotaan/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRegistrasiKeanggotaan(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = registrasiKeanggotaanService.findByName(nama); - + Map result = registrasiKeanggotaanService.findByName(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - // regius - @Autowired private RekamDataPegawaiService rekamDataPegawaiService; @@ -1617,14 +1223,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveRekamDataPegawai(@Valid @RequestBody RekamDataPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = rekamDataPegawaiService.saveRekamDataPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1634,21 +1237,17 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/save-uraian-tugas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugas(@Valid @RequestBody UraianTugasVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = uraianTugasService.saveUraianTugas(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1658,7 +1257,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1668,14 +1266,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveKategoryTugas(@Valid @RequestBody KategoryTugasVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = KategoryTugasService.saveKategoryTugas(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1685,7 +1280,6 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @Autowired @@ -1695,14 +1289,11 @@ public class SdmController extends LocaleController { public ResponseEntity> saveIsianPelamar(@Valid @RequestBody IsianPelamarVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = IsianPelamarService.saveIsianPelamar(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -1712,21 +1303,18 @@ public class SdmController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } - } @RequestMapping(value = "/get-isian-pelamar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getIsianPelamar(HttpServletRequest request) { - Map result = null; try { - result = IsianPelamarService.findDataPelamar(); - + Map result = IsianPelamarService.findDataPelamar(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -1736,7 +1324,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveAsuransiNaker(@Valid @RequestBody AsuransiNakerVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); Map result = AsuransiNakerService.saveAsuransiNaker(vo); if (null != result) @@ -1763,7 +1350,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveNamaPegawai(@Valid @RequestBody NamaPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); Map result = NamaPegawaiService.saveNamaPegawai(vo); if (null != result) @@ -1790,7 +1376,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveMasterHonorTim(@Valid @RequestBody MasterHonorTimVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); Map result = MasterHonorTimService.saveMasterHonorTim(vo); if (null != result) @@ -1817,7 +1402,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveMasterJenisSantunan(@Valid @RequestBody MasterJenisSantunanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); Map result = MasterJenisSantunanService.saveMasterJenisSantunan(vo); if (null != result) @@ -1844,8 +1428,6 @@ public class SdmController extends LocaleController { public ResponseEntity> savePernelitianEksternal(@Valid @RequestBody PernelitianEksternalVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = PernelitianEksternalService.savePernelitianEksternal(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1871,8 +1453,6 @@ public class SdmController extends LocaleController { public ResponseEntity> savePerhitunganHonorTimPegawai( @Valid @RequestBody PerhitunganHonorTimPegawaiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = PerhitunganHonorTimPegawaiService.savePerhitunganHonorTimPegawai(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1898,8 +1478,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJenisHonor(@Valid @RequestBody JenisHonorVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = JenisHonorService.saveJenisHonor(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1925,8 +1503,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveTahunUmr(@Valid @RequestBody TahunUmrVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = TahunUmrService.saveTahunUmr(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1952,8 +1528,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJenisGaji(@Valid @RequestBody JenisGajiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = JenisGajiService.saveJenisGaji(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1988,8 +1562,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveGolongan(@Valid @RequestBody GolonganVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = GolonganService.saveGolongan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2015,8 +1587,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveGajiPokok(@Valid @RequestBody GajiPokokVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = GajiPokokService.saveGajiPokok(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2042,8 +1612,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveIndekKinerja(@Valid @RequestBody List vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = indekKinerjaService.saveIndekKinerja(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2066,16 +1634,14 @@ public class SdmController extends LocaleController { public ResponseEntity> getPegawaiByJadwal(@PathVariable("tahun") Integer tahun, @PathVariable("bulan") Integer bulan, @PathVariable("pegawai") Integer pegawai, HttpServletRequest request) { - Map result = null; try { - result = indekKinerjaService.findPegawaiByRuangan(tahun, bulan, pegawai); - + Map result = indekKinerjaService.findPegawaiByRuangan(tahun, bulan, pegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -2084,10 +1650,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/set-uraian-tugas/{id}/{bobot}/{target}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> setBobot(@PathVariable("id") Integer id, @PathVariable("bobot") Integer bobot, @PathVariable("target") Integer target, HttpServletRequest request) { - Map result = null; try { - result = new HashMap<>(); - MapUraianTugasToRincianKegiatan model = mapUraianTugasToRincianKegiatanDao.findOne(id); model.setBobot(bobot.toString()); model.setTarget(target.toString()); @@ -2098,10 +1661,10 @@ public class SdmController extends LocaleController { mapUraianTugasToRincianKegiatanDao.save(model); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonHttptatus(HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/add-uraian-tugas/{id}/{group}/{bobot}/{target}/{description}/{jabatanId}/{pegawaiId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -2110,10 +1673,7 @@ public class SdmController extends LocaleController { @PathVariable("group") String group, @PathVariable("description") String description, @PathVariable("jabatanId") Integer jabatanId, @PathVariable("pegawaiId") Integer pegawaiId, HttpServletRequest request) { - Map result = null; try { - result = new HashMap<>(); - MapUraianTugasToRincianKegiatan model = mapUraianTugasToRincianKegiatanDao.findOne(id); model.setBobot(bobot.toString()); model.setTarget(target.toString()); @@ -2124,10 +1684,10 @@ public class SdmController extends LocaleController { mapUraianTugasToRincianKegiatanDao.save(model); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonHttptatus(HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -2137,8 +1697,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveJenisKompetensi(@Valid @RequestBody JenisKompetensiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = JenisKompetensiService.saveJenisKompetensi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2164,8 +1722,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveKompetensi(@Valid @RequestBody KompetensiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = KompetensiService.saveKompetensi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2191,8 +1747,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveKelompokKompetensi(@Valid @RequestBody KelompokKompetensiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = KelompokKompetensiService.saveKelompokKompetensi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2218,8 +1772,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveFaktorEvaluasi(@Valid @RequestBody FaktorEvaluasiVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = FaktorEvaluasiService.saveFaktorEvaluasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2245,8 +1797,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody NilaiKelompokJabatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = kelompokJabatanService.saveNilaiKelompokJabatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2272,8 +1822,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveRangeKmk(@Valid @RequestBody RangeKmkVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = RangeKmkService.saveRangeKmk(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2299,8 +1847,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveMasterEvaluasiJabatan(@Valid @RequestBody MasterEvaluasiJabatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = MasterEvaluasiJabatanService.saveMasterEvaluasiJabatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2323,8 +1869,6 @@ public class SdmController extends LocaleController { public ResponseEntity> hitungMasterEvaluasiJabatan( @Valid @RequestBody MasterEvaluasiJabatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = MasterEvaluasiJabatanService.hitungPoinEvaluasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2347,8 +1891,6 @@ public class SdmController extends LocaleController { public ResponseEntity> hitungGradeEvaluasiJabatan(@Valid @RequestBody EvaluasiJabatanVO vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = EvaluasiJabatanService.hitungPoinEvaluasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2369,33 +1911,27 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListJabatan(HttpServletRequest request) { - Map result = null; try { - - result = MasterEvaluasiJabatanService.findJabatan(); - + Map result = MasterEvaluasiJabatanService.findJabatan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-by-jabatan/{idJabatan}/{bulan}/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListByJabatan(@PathVariable("idJabatan") Integer idJabatan, @PathVariable("bulan") String bulan, @PathVariable("tahun") Integer tahun, HttpServletRequest request) { - Map result = null; try { - - result = MasterEvaluasiJabatanService.findEvaluasiByJabatan(idJabatan, tahun, bulan); - + Map result = MasterEvaluasiJabatanService.findEvaluasiByJabatan(idJabatan, tahun, bulan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -2405,8 +1941,6 @@ public class SdmController extends LocaleController { public ResponseEntity> saveEvaluasiJabatan(@Valid @RequestBody List vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = EvaluasiJabatanService.saveEvaluasiJabatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2428,90 +1962,55 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getEvaluasiJabatan(@RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "bulan") String bulan, @RequestParam(value = "ruangan") Integer ruangan, - // @RequestParam(value = "noOrder") String noOrder, - HttpServletRequest request) throws ParseException { - // try { - - // @RequestMapping(value = - // "/get-evaluasi-jabatan/{tahun}/{bulan}/{pegawai}", method = - // RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - // public ResponseEntity> getEvaluasiJabatan( - // @PathVariable("tahun") Integer tahun, - // @PathVariable("bulan") Integer bulan, - // @PathVariable("ruangan") Integer ruangan, - // HttpServletRequest request) { - Map result = null; + HttpServletRequest request) { try { - result = EvaluasiJabatanService.findEvaluasiJabatan(tahun, bulan, ruangan); - + Map result = EvaluasiJabatanService.findEvaluasiJabatan(tahun, bulan, ruangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-count-evaluasi-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getCountEvaluasiJabatan(@RequestParam(value = "tahun") Integer tahun, - // @RequestParam(value = "noOrder") String noOrder, - HttpServletRequest request) throws ParseException { - - Map result = null; + HttpServletRequest request) { try { - result = EvaluasiJabatanService.CountEvaluasi(tahun); - + Map result = EvaluasiJabatanService.CountEvaluasi(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekap", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRekap(@RequestParam(value = "tahun") Integer tahun, - // @RequestParam(value = "noOrder") String noOrder, - HttpServletRequest request) throws ParseException { - // try { - - // @RequestMapping(value = - // "/get-evaluasi-jabatan/{tahun}/{bulan}/{pegawai}", method = - // RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - // public ResponseEntity> getEvaluasiJabatan( - // @PathVariable("tahun") Integer tahun, - // @PathVariable("bulan") Integer bulan, - // @PathVariable("ruangan") Integer ruangan, - // HttpServletRequest request) { - Map result = null; + HttpServletRequest request) { try { - result = EvaluasiJabatanService.findPegawaiByTahun(tahun); - + Map result = EvaluasiJabatanService.findPegawaiByTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-evaluasi-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getEvaluasiPegawai(@RequestParam(value = "tahun") Integer tahun, @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "bulan") Integer bulan, - // @RequestParam(value = "noOrder") String noOrder, - HttpServletRequest request) throws ParseException { - // try { - - Map result = null; + HttpServletRequest request) { try { - result = EvaluasiJabatanService.findPegawaiByTahun(tahun, idPegawai); - + Map result = EvaluasiJabatanService.findPegawaiByTahun(tahun, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -2519,10 +2018,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-simulasi-pendapatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveSimulasiPendapatan(@Valid @RequestBody SimulasiPendapatanVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = simulasiPendapatanService.saveSimulasiPendapatan(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2544,17 +2041,14 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-save-simulasi-pendapatan/{tahun}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getsaveSimulasiPendapatan(@PathVariable("tahun") Integer tahun, HttpServletRequest request) { - Map result = null; try { - - result = simulasiPendapatanService.findByTahun(tahun); - + Map result = simulasiPendapatanService.findByTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -2562,10 +2056,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-perhitungan-abk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePerhitunganAbk(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = PerhitunganAbkService.savePerhitunganAbk(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2586,19 +2078,15 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-perhitungan-abk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getPerhitunganAbk(@RequestParam(value = "tahun") Integer tahun, - - HttpServletRequest request) throws ParseException { - - Map result = null; + HttpServletRequest request) { try { - result = PerhitunganAbkService.findByTahun(tahun); - + Map result = PerhitunganAbkService.findByTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @Autowired @@ -2606,10 +2094,8 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-jadwal-orientasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveJadwalOrientasi(@Valid @RequestBody JadwalOrientasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - Map result = jadwalOrientasiService.saveJadwalOrientasi(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2631,118 +2117,98 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-save-jadwal-orientasi/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getsaveJadwalOrientasi(@PathVariable("nama") String nama, HttpServletRequest request) { - Map result = null; try { - if (nama.equals("-")) - nama = ""; - result = jadwalOrientasiService.findByName(nama); - + Map result = jadwalOrientasiService.findByName(nama); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-tindakan-by-user-id/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByUserId(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - List> result = null; try { - System.out.println(endDate); - result = indekKinerjaService.findByUserId(startDate, endDate); - + List> result = indekKinerjaService.findByUserId(startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-tindakan-by-user-id-and-periode/{month}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getTindakanByIdUserAndPeriod(@PathVariable("month") String month, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.findTindakanByIdUserAndPeriod(month); - + List> result = indekKinerjaService.findTindakanByIdUserAndPeriod(month); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerja(HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.findUraianTugas();// validasitargetbobotnull - + List> result = indekKinerjaService.findUraianTugas(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-persen-uraian-kerja/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPersen(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.findCountTindakanByIdUserAndPeriod(startDate, endDate); - + List> result = indekKinerjaService.findCountTindakanByIdUserAndPeriod(startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-poin/{tgl}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDetailPoin(@PathVariable("tgl") String tgl, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.detailPoin(tgl, idPegawai); - + Map result = indekKinerjaService.detailPoin(tgl, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekap-poin/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRekapPoin(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.rekapPoin(month, idPegawai); - + Map result = indekKinerjaService.rekapPoin(month, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + } @RequestMapping(value = "/save-uraian-tugas-transaksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugasTransaksi(@Valid @RequestBody UraianTugasCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveUraianTugas(vo); if (null != result) @@ -2766,85 +2232,70 @@ public class SdmController extends LocaleController { public ResponseEntity> getIndekKinerjaKuantitas(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, @RequestParam(value = "isNew", required = false) Boolean isNew, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.getIndekKinerjaKuantitasData(month, idPegawai, isNew); - + Map result = indekKinerjaService.getIndekKinerjaKuantitasData(month, idPegawai, isNew); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekapitulasi-capaian/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRekapitulasiCapaian(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.getRekapitulasiCapaianUraianTugas(month, idPegawai); - + Map result = indekKinerjaService.getRekapitulasiCapaianUraianTugas(month, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian-kerja-dan-capaian/{date}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerjaDanCapaian(@PathVariable("date") String date, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.findUraianTugasByTanggal(date); - + List> result = indekKinerjaService.findUraianTugasByTanggal(date); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-target-bobot-uraian-kerja/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getTargetBobotUraianKerja(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { - Map result = null; try { - - result = uraianTugasTransaksiService.findTargetAndBobot(idPegawai, periode); - + Map result = uraianTugasTransaksiService.findTargetAndBobot(idPegawai, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-id-pgw", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getIDs(HttpServletRequest request) { - Pegawai result = null; try { - - result = indekKinerjaService.getPegawaiByUserLogin(); - + Pegawai result = indekKinerjaService.getPegawaiByUserLogin(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-target-bobot-uraian-tugas-transaksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveTargetBobotUraianTugasTransaksi( - @Valid @RequestBody UraianTugasCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody UraianTugasCustomVO vo, HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveTargetBobotUraianTugas(vo); if (null != result) @@ -2866,7 +2317,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-indeks-kinerja-individu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveIndeksKinerjaindividu(@Valid @RequestBody IndeksKinerjaIndividuVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = indekKinerjaService.saveIndekKinerjaIndividu(vo); if (null != result) @@ -2888,7 +2339,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-list-indeks-kinerja-individu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveListIndeksKinerjaindividu( - @Valid @RequestBody IndeksKinerjaIndividuCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody IndeksKinerjaIndividuCustomVO vo, HttpServletRequest request) { try { Map result = indekKinerjaService.saveAllIndekKinerja(vo); if (null != result) @@ -2911,39 +2362,34 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-kualitas-inovasi-IKI/{periode}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKualitasAndInovasi(@PathVariable("periode") String periode, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.findKualitasAndInovasi(periode, idPegawai); - + Map result = indekKinerjaService.findKualitasAndInovasi(periode, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.jumlahKehadiran(null, null, idPegawai, startDate, endDate); - + Map result = monitoringAbsenService.jumlahKehadiran(null, null, idPegawai, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-monitoring-absen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveMonitoringAbsen(@Valid @RequestBody MonitoringAbsenCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveMonitoring(vo); if (null != result) @@ -2966,105 +2412,90 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-kehadiran-iki/{periode}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranIKI(@PathVariable("periode") String periode, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.findKehadiran(periode, idPegawai); - + Map result = indekKinerjaService.findKehadiran(periode, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranByRuangan(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, null, null, startDate, endDate); - + Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, null, null, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-by-ruangan/{idUnitKerja}/{idSubUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranByRuangan(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("idSubUnitKerja") Integer idSubUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, idSubUnitKerja, null, startDate, endDate); - + Map result = monitoringAbsenService.jumlahKehadiran(idUnitKerja, idSubUnitKerja, null, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-all-pegawai/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findAllKehadiran(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.findKehadiranAllPegawai(startDate, endDate); - + Map result = monitoringAbsenService.findKehadiranAllPegawai(startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-rekap-IKI/{idRuangan}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findRekapIKI(@PathVariable("idRuangan") Integer idRuangan, @PathVariable("periode") String periode, HttpServletRequest request) { - Map result = null; try { - - result = indekKinerjaService.rekapIKI(idRuangan, periode); - + Map result = indekKinerjaService.rekapIKI(idRuangan, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-penilaian-kompetensi/{idJabatan}/{tglPenilaian}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findRekapIKI(@PathVariable("idJabatan") Integer idJabatan, @PathVariable("tglPenilaian") String tglPenilaian, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = riwayatPenilaianKompetensiPegawaiService.getPenilaianKompetensiPegawai(idJabatan, tglPenilaian, - idPegawai);// bp + Map result = riwayatPenilaianKompetensiPegawaiService + .getPenilaianKompetensiPegawai(idJabatan, tglPenilaian, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-penilaian-kompetensi-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePenilaianKompetensiPegawai(@Valid @RequestBody StrukHistoriVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = riwayatPenilaianKompetensiPegawaiService.savePenilaianKompetensiPegawai(vo); if (null != result) @@ -3133,7 +2564,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getUserLogin", e.getMessage()); @@ -3147,7 +2578,7 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-data-by-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataByPegawai(@RequestParam(value = "id", required = true) Integer id, + public ResponseEntity> getDataByPegawai(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = serviceMusare.getDataMuSaReByPegawai(id); @@ -3156,7 +2587,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataByPegawai", e.getMessage()); @@ -3173,7 +2604,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-pengajuan-mutasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanMutasi( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanMutasi(ruanganId); if (null != result) { @@ -3181,7 +2612,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when loadPagePengajuanMutasi", e.getMessage()); @@ -3216,8 +2647,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-list-pengajuan-mutasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListPengajuanMutasi( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getListPengajuanMutasi(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanMutasi(id); if (null != result) { @@ -3225,7 +2656,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPengajuanMutasi", e.getMessage()); @@ -3242,7 +2673,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-pengajuan-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanSanksi( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanSanksi(ruanganId); if (null != result) { @@ -3250,7 +2681,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when loadPagePengajuanSanksi", e.getMessage()); @@ -3285,8 +2716,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-list-pengajuan-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListPengajuanSanksi( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getListPengajuanSanksi(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanSanksi(id); if (null != result) { @@ -3294,7 +2725,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPengajuanSanksi", e.getMessage()); @@ -3311,7 +2742,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-pengajuan-resign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> loadPagePengajuanResign( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, HttpServletRequest request) { + @RequestParam(value = "ruanganId") Integer ruanganId, HttpServletRequest request) { try { Map result = serviceMusare.loadPagePengajuanResign(ruanganId); if (null != result) { @@ -3319,7 +2750,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when loadPagePengajuanResign", e.getMessage()); @@ -3354,8 +2785,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-list-pengajuan-resign", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getListPengajuanResign( - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getListPengajuanResign(@RequestParam(value = "id") Integer id, + HttpServletRequest request) { try { Map result = serviceMusare.getListPengajuanResign(id); if (null != result) { @@ -3363,7 +2794,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPengajuanResign", e.getMessage()); @@ -3380,7 +2811,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-pengajuan-musare", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListDaftarMuSaRe( - @RequestParam(value = "namaPegawai", required = true) String namaPegawai, HttpServletRequest request) { + @RequestParam(value = "namaPegawai") String namaPegawai, HttpServletRequest request) { try { Map result = serviceMusare.getListDaftarMuSaRe(namaPegawai); if (null != result) { @@ -3388,7 +2819,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListDaftarMuSaRe", e.getMessage()); @@ -3445,7 +2876,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-history-sanksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecSanksi( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecSanksi(pegawaiId); if (null != result) { @@ -3453,7 +2884,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getHistoryExecSanksi", e.getMessage()); @@ -3468,7 +2899,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-history-pangkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecPangkat( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecPangkat(pegawaiId); if (null != result) { @@ -3476,7 +2907,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getHistoryExecPangkat", e.getMessage()); @@ -3491,7 +2922,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-history-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getHistoryExecJabatan( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = serviceMusare.getHistoryExecJabatan(pegawaiId); if (null != result) { @@ -3499,7 +2930,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getHistoryExecJabatan", e.getMessage()); @@ -3514,7 +2945,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-login-user-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUserLoginPermohonanStatus(HttpServletRequest request, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai) { + @RequestParam(value = "idPegawai") Integer idPegawai) { try { Map result = servicePermohonanStatus.getUserLogin(idPegawai); if (null != result) { @@ -3522,7 +2953,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when servicePermohonanStatus", e.getMessage()); @@ -3537,8 +2968,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-load-permohonan-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData( - @RequestParam(value = "subUnitKerjaId", required = true) Integer subUnitKerjaId, - HttpServletRequest request) { + @RequestParam(value = "subUnitKerjaId") Integer subUnitKerjaId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getLoadData(subUnitKerjaId); if (null != result) { @@ -3546,7 +2976,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getLoadData", e.getMessage()); @@ -3560,11 +2990,9 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-data-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataCuti( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, + public ResponseEntity> getDataCuti(@RequestParam(value = "pegawaiId") Integer pegawaiId, @RequestParam(value = "year", required = false) String year, - @RequestParam(value = "statusPegawaiId", required = true) Integer statusPegawaiId, - HttpServletRequest request) { + @RequestParam(value = "statusPegawaiId") Integer statusPegawaiId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getDataCuti(pegawaiId, year, statusPegawaiId); if (null != result) { @@ -3572,7 +3000,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataCuti", e.getMessage()); @@ -3587,7 +3015,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-data-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataPermohonanStatus( - @RequestParam(value = "pegawaiId", required = true) Integer pegawaiId, HttpServletRequest request) { + @RequestParam(value = "pegawaiId") Integer pegawaiId, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getDataPermohonanStatus(pegawaiId); if (null != result) { @@ -3595,7 +3023,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataPermohonanStatus", e.getMessage()); @@ -3618,7 +3046,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage()); @@ -3633,7 +3061,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-approval-status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListApprovalStatus( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, HttpServletRequest request) { + @RequestParam(value = "idPegawai") Integer idPegawai, HttpServletRequest request) { try { Map result = servicePermohonanStatus.getApprovalStatus(idPegawai); if (null != result) { @@ -3641,7 +3069,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage()); @@ -3656,7 +3084,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-approval-status-by-status-pegawai-plan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getApprovalStatusByStatusPegawaiPlan( - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, + @RequestParam(value = "idPegawai") Integer idPegawai, @RequestParam(value = "statusPegawaiPlanId", required = false) Integer statusPegawaiPlanId, HttpServletRequest request) { try { @@ -3667,7 +3095,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage()); @@ -3723,8 +3151,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/delete-pegawai-status/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deletePlanningPegawaiStatus( - @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) { + public ResponseEntity> deletePlanningPegawaiStatus(@RequestParam(value = "noRec") String noRec, + HttpServletRequest request) { try { Map result = servicePermohonanStatus.deletePlanningPegawaiStatus(noRec); if (null != result) @@ -3797,7 +3225,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getPeriodeRekap", e.getMessage()); @@ -3811,8 +3239,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-daftar-gaji-pns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDaftarGajiPns( - @RequestParam(value = "periode", required = true) String periode, HttpServletRequest request) { + public ResponseEntity> getDaftarGajiPns(@RequestParam(value = "periode") String periode, + HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDaftarGajiPns(periode); if (null != result) { @@ -3820,7 +3248,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getStrukHistori", e.getMessage()); @@ -3834,11 +3262,9 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-detail-gaji-pns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDtailGajiPns( - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "id", required = true) Integer id, - @RequestParam(value = "periode", required = true) String periode, - @RequestParam(value = "namaPegawai", required = true) String namaPegawai, HttpServletRequest request) { + public ResponseEntity> getDtailGajiPns(@RequestParam(value = "noRec") String noRec, + @RequestParam(value = "id") Integer id, @RequestParam(value = "periode") String periode, + @RequestParam(value = "namaPegawai") String namaPegawai, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDtailGajiPns(noRec, id, namaPegawai, periode); if (null != result) { @@ -3846,7 +3272,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataGajiPegawai", e.getMessage()); @@ -3860,8 +3286,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-daftar-gaji-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDaftarGajiPkwt( - @RequestParam(value = "periode", required = true) String periode, HttpServletRequest request) { + public ResponseEntity> getDaftarGajiPkwt(@RequestParam(value = "periode") String periode, + HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDaftarGajiPkwt(periode); if (null != result) { @@ -3869,7 +3295,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDaftarGajiPkwt", e.getMessage()); @@ -3883,9 +3309,8 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-detail-gaji-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDtailGajiPkwt( - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "id", required = true) Integer id, HttpServletRequest request) { + public ResponseEntity> getDtailGajiPkwt(@RequestParam(value = "noRec") String noRec, + @RequestParam(value = "id") Integer id, HttpServletRequest request) { try { Map result = informasiDaftarGajiService.getDtailGajiPkwt(noRec, id); if (null != result) { @@ -3893,7 +3318,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDtailGajiPkwt", e.getMessage()); @@ -3911,38 +3336,34 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-gap-kompetensi/{idRuangan}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> findGapKompetensi(@PathVariable("idRuangan") Integer idRuangan, @PathVariable("periode") String periode, HttpServletRequest request) { - List> result = null; try { - - result = riwayatPenilaianKompetensiPegawaiService.getGapKompetensiPegawai(idRuangan, periode); - + List> result = riwayatPenilaianKompetensiPegawaiService + .getGapKompetensiPegawai(idRuangan, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + } @RequestMapping(value = "/get-kompetensi-by-ruangan/{idRuangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findGapKompetensi(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) { - Map result = null; try { - - result = riwayatPenilaianKompetensiPegawaiService.getKompetensiPegawai(idRuangan); - + Map result = riwayatPenilaianKompetensiPegawaiService.getKompetensiPegawai(idRuangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-rekap-kehadiran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRekapKehadiran(@Valid @RequestBody StrukHistoriVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveRekapKomponen(vo); if (null != result) @@ -3964,7 +3385,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-total-index-kehadiran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveTotalIndexKehadiran(@Valid @RequestBody StrukHistoriVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveTotalIndexRekapitulasiKehadiran(vo); if (null != result) @@ -3986,7 +3407,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-factor-rate-kelompok-Shift", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveFactorRateKelompokShift( - @Valid @RequestBody KelompokShiftKerjaCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody KelompokShiftKerjaCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveFactorRate(vo); if (null != result) @@ -4008,120 +3429,104 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-rencana-tindak-lanjut", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> findRencanaTindakLanjut(HttpServletRequest request) { - List> result = null; try { - - result = riwayatPenilaianKompetensiPegawaiService.getRencanaTindakLanjut(); - + List> result = riwayatPenilaianKompetensiPegawaiService.getRencanaTindakLanjut(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.rekapitulasiKehadiranAllPegawai(idPegawai, startDate, endDate); - + Map result = monitoringAbsenService.rekapitulasiKehadiranAllPegawai(idPegawai, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapKehadiranByUnitKerja( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerja(idUnitKerja, startDate, endDate); - + Map result = monitoringAbsenService.rekapitulasiKehadiranByUnitKerja(idUnitKerja, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-index-kehadiran-by-unit-kerja/{idUnitKerja}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapIndeksKehadiranByUnitKerja( @PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.rekapitulasiIndeksKehadiranByunitKerja(idUnitKerja, startDate, endDate); - + Map result = monitoringAbsenService.rekapitulasiIndeksKehadiranByunitKerja(idUnitKerja, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/rekap-index-kehadiran/{idPegawai}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> rekapIndeksKehadiran(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.rekapitulasiIndexKehadiranAllPegawai(idPegawai, startDate, endDate); - + Map result = monitoringAbsenService.rekapitulasiIndexKehadiranAllPegawai(idPegawai, + startDate, endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-komponen-index", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListKomponenIndex(HttpServletRequest request) { - List> result = null; try { - - result = shiftKerjaService.getListKomponenIndex(); + List> result = shiftKerjaService.getListKomponenIndex(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-jadwal-Kerja/{idRuangan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getJadwalKerja(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) { - List> result = null; try { - - result = pegawaiJadwalKerjaService.getShiftKerja(idRuangan); - + List> result = pegawaiJadwalKerjaService.getShiftKerja(idRuangan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-pegawai-jadwal-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveapegawaiJadwalKerja( - @Valid @RequestBody PegawaiJadwalKerjaCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody PegawaiJadwalKerjaCustomVO vo, HttpServletRequest request) { try { Map result = pegawaiJadwalKerjaService.saveJadwalKerja(vo); if (null != result) @@ -4143,50 +3548,42 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-shift-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListShiftKerja(HttpServletRequest request) { - List> result = null; try { - - result = shiftKerjaService.getListShiftKerja(); - + List> result = shiftKerjaService.getListShiftKerja(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-factor-rate-shift-kerja/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListFactorRateShiftKerja(HttpServletRequest request, @PathVariable("periode") String periode) { - List> result = null; try { - - result = monitoringAbsenService.findFactorRateIndekkehadiran(periode); - + List> result = monitoringAbsenService.findFactorRateIndekkehadiran(periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } - // Get data list Master Jabatan Evaluasi + // Get data list Jabatan Evaluasi @RequestMapping(value = "/get-list-master-evaluasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListMasterJabatanEvaluasiByTahunBulan( @RequestParam(value = "tahun", required = false) Integer tahun, @RequestParam(value = "bulan", required = false) String bulan, HttpServletRequest request) { - Map result = null; try { - - result = EvaluasiJabatanService.findEvaluasiJabatanTahun(tahun); + Map result = EvaluasiJabatanService.findEvaluasiJabatanTahun(tahun); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } // @@ -4194,38 +3591,33 @@ public class SdmController extends LocaleController { public ResponseEntity> findKehadiranLemburKerjaSdm(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, startDate, endDate); - + Map result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, startDate, + endDate); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-kehadiran-lembur-sdm-by-periode/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> findKehadiranLemburKerjaSdm(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { - Map result = null; try { - - result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, periode); - + Map result = monitoringAbsenService.jumlahKehadiranLemburKerjaSdm(idPegawai, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-input-lembur-verifikasi-sdm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveInputLemburVerifikasiSdm( - @Valid @RequestBody InputLemburSdmCustomVO vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody InputLemburSdmCustomVO vo, HttpServletRequest request) { try { Map result = monitoringAbsenService.saveLemburVerifikasiSdm(vo); if (null != result) @@ -4304,7 +3696,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-perhitungan-uang-lembur", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUangLembur(@Valid @RequestBody Set vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveUangLembur(vo); if (null != result) @@ -4327,17 +3719,15 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-poin-dokter/{idUnitKerja}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPoinDokter(@PathVariable("idUnitKerja") Integer idUnitKerja, @PathVariable("periode") String periode, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.getIndekKinerjaKuantitasPerUnitKerja(periode, idUnitKerja); - + List> result = indekKinerjaService.getIndekKinerjaKuantitasPerUnitKerja(periode, + idUnitKerja); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/menangguhkan-permohonan-status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) @@ -4371,7 +3761,7 @@ public class SdmController extends LocaleController { getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage()); @@ -4386,7 +3776,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-jatah-cuti-dan-izin", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveJatahCutiDanIzin(@Valid @RequestBody KelompokShiftKerjaCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = servicePermohonanStatus.setJatahCuti(vo); if (null != result) @@ -4408,7 +3798,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-jatah-cuti-dan-izin-pegawai", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveJatahCutiDanIzinPegawai(@Valid @RequestBody JatahCutiDanIzinVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = servicePermohonanStatus.setJatahCutiPegawai(vo); if (null != result) @@ -4430,7 +3820,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-mapping-pegawai-to-atasan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveMappingPegawaiToJabatan( - @Valid @RequestBody List vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody List vo, HttpServletRequest request) { try { Map result = mappingPegawaiToAtasanService.saveMappingPegawaiToAtasan(vo); if (null != result) @@ -4453,53 +3843,44 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-pegawai-bawahan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaibawahan(@PathVariable("id") Integer id, HttpServletRequest request) { - List> result = null; try { - - result = mappingPegawaiToAtasanService.getPegawaibawahan(id); - + List> result = mappingPegawaiToAtasanService.getPegawaibawahan(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-mapping-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getMappingPegawai(HttpServletRequest request) { - List> result = null; try { - - result = mappingPegawaiToAtasanService.getMappingpegawai(); - + List> result = mappingPegawaiToAtasanService.getMappingpegawai(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-pegawai-atasan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getPegawaiAtasan(@PathVariable("id") Integer id, HttpServletRequest request) { - List> result = null; try { - - result = mappingPegawaiToAtasanService.getPegawaiAtasan(id); - + List> result = mappingPegawaiToAtasanService.getPegawaiAtasan(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-rincian-kegiatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatan(@Valid @RequestBody RincianKegiatanVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasService.saveRincianKegiatan(vo); if (null != result) @@ -4521,7 +3902,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-map-rincian-kegiatan-to-uraian-tugas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatanToUraianTugas(@Valid @RequestBody UraianTugasMVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasService.saveUraianTugasNew(vo); if (null != result) @@ -4543,7 +3924,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-acuan-indeks-iki", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveAcuanIndeksIKI(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = indekKinerjaService.saveTabelAcuanIndeksIKI(vo); if (null != result) @@ -4565,68 +3946,56 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-acuan-iki", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllAcuan(HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.findAcuanIndeksIKI(); - + List> result = indekKinerjaService.findAcuanIndeksIKI(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-indeks-iki/{nilai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getIndeksIKI(@PathVariable("nilai") Double nilai, HttpServletRequest request) { - Double result = 0.0; try { - - result = indekKinerjaService.getIndeksIKI(nilai); - + Double result = indekKinerjaService.getIndeksIKI(nilai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-uraian-tugas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllUT(HttpServletRequest request) { - List> result = null; try { - - result = uraianTugasTransaksiService.findAllUraianTugas(); - + List> result = uraianTugasTransaksiService.findAllUraianTugas(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-uraian-kerja-by-jabatan/{idJabatan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getUraianKerjaByJabatan( @PathVariable("idJabatan") Integer idJabatan, HttpServletRequest request) { - List> result = null; try { - - result = uraianTugasTransaksiService.getUraianTugasByJabatan(idJabatan); - + List> result = uraianTugasTransaksiService.getUraianTugasByJabatan(idJabatan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-unit-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRincianKegiatan(@Valid @RequestBody UnitKerjaPegawaiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = unitKerjaPegawaiService.saveUnitkerja(vo); if (null != result) @@ -4648,38 +4017,32 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllUnitKerja(HttpServletRequest request) { - List result = null; try { - - result = unitKerjaPegawaiService.getAllUnitKerja(); - + List result = unitKerjaPegawaiService.getAllUnitKerja(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-unit-kerja-by-name/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getUnitKerjaByName(@PathVariable("name") String name, HttpServletRequest request) { - List result = null; try { - - result = unitKerjaPegawaiService.getUnitKerjaByName(name); - + List result = unitKerjaPegawaiService.getUnitKerjaByName(name); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-habsen-manual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveHabsenManual(@Valid @RequestBody MonitoringAbsenCustomVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = monitoringAbsenService.saveAbsenManual(vo); if (null != result) @@ -4701,7 +4064,7 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/save-sub-unit-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveSubUnitKerja(@Valid @RequestBody SubUnitKerjaPegawaiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = unitKerjaPegawaiService.saveSubUnitkerja(vo); if (null != result) @@ -4723,134 +4086,112 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-sub-unit-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllSubUnitKerja(HttpServletRequest request) { - List> result = null; try { - - result = unitKerjaPegawaiService.getAllSubUnitKerja(); - + List> result = unitKerjaPegawaiService.getAllSubUnitKerja(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-sub-unit-kerja-by-name/{name}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getSubUnitKerjaByName(@PathVariable("name") String name, HttpServletRequest request) { - List> result = null; try { - - result = unitKerjaPegawaiService.getSubUnitKerjaByName(name); - + List> result = unitKerjaPegawaiService.getSubUnitKerjaByName(name); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-sub-unit-kerja-by-unit-kerja/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getSubUnitKerjaByUnitKerja(@PathVariable("id") Integer id, HttpServletRequest request) { - List> result = null; try { - - result = unitKerjaPegawaiService.getAllSubUnitKerjaByUnitKerja(id); - + List> result = unitKerjaPegawaiService.getAllSubUnitKerjaByUnitKerja(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-habsen-manual/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getHabsenManual(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = null; try { - - result = monitoringAbsenService.getByLoc_Code(idPegawai); - + List> result = monitoringAbsenService.getByLoc_Code(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-tindakan-dokter/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakan(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.getAllTindakanByDokter(month, idPegawai); - + List> result = indekKinerjaService.getAllTindakanByDokter(month, idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-tindakan-dokter-fee-for-service/{month}/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllTindakanFeeForService(@PathVariable("month") String month, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.getAllTindakanByDokterForfeeForService(month, idPegawai); - + List> result = indekKinerjaService.getAllTindakanByDokterForfeeForService(month, + idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-pasien/{idProduk}/{idKelas}/{idPegawai}/{tgl}/{ffs}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailPasien(@PathVariable("idProduk") Integer idProduk, @PathVariable("idKelas") Integer idKelas, @PathVariable("tgl") String tgl, @PathVariable("ffs") Boolean ffs, @PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.findPatientDetailForEveryTindakan(idProduk, idKelas, idPegawai, tgl, ffs); - + List> result = indekKinerjaService.findPatientDetailForEveryTindakan(idProduk, idKelas, + idPegawai, tgl, ffs); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-kelompok-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllKelompokJabatan(HttpServletRequest request) { - List> result = null; try { - - result = jabatanService.getKelompokJabatan(); - + List> result = jabatanService.getKelompokJabatan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-master-kelompok-jabatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveKelompokJabatan(@Valid @RequestBody KelompokJabatanVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = jabatanService.saveKelompokJabatan(vo); if (null != result) @@ -4872,67 +4213,55 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-all-kedudukan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllKedudukan(HttpServletRequest request) { - List> result = null; try { - - result = kedudukanService.getKedudukanByStatusEnabled(); - + List> result = kedudukanService.getKedudukanByStatusEnabled(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-kategoriPegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllategoriPegawai(HttpServletRequest request) { - Map result = new HashMap(); try { - - result = kategoriPegawaiService.findAlls(); - + Map result = kategoriPegawaiService.findAlls(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-golongan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllGolongan(HttpServletRequest request) { - List> result = null; try { - - result = GolonganService.getKedudukanByStatusEnabled(); - + List> result = GolonganService.getKedudukanByStatusEnabled(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-hari-libur", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getAllHariLibur(HttpServletRequest request) { - List> result = null; try { - - result = indekKinerjaService.getAllMapKalenderToHariLibur(); - + List> result = indekKinerjaService.getAllMapKalenderToHariLibur(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-hari-libur", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveHariLibur(@Valid @RequestBody MapKalenderToHariLiburVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = indekKinerjaService.saveMapKalenderToHariLibur(vo); if (null != result) @@ -4954,69 +4283,57 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-grade/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getGrade(@PathVariable("id") Integer id, HttpServletRequest request) { - Map result = null; try { - - result = kelompokJabatanService.getNilaiKelompokJabatan(id); - + Map result = kelompokJabatanService.getNilaiKelompokJabatan(id); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-kelompok-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDetailkelompokJabatan(HttpServletRequest request) { - List> result = null; try { - - result = kelompokJabatanService.getAllByStatusEnabled(); - + List> result = kelompokJabatanService.getAllByStatusEnabled(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-detail-history-pegawai/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getDetailHistoryPegawai(@PathVariable("noRec") String noRec, HttpServletRequest request) { - RekamDataPegawaiCustomVO result = null; try { - - result = rekamDataPegawaiService.getDetailPerubahan(noRec); - + RekamDataPegawaiCustomVO result = rekamDataPegawaiService.getDetailPerubahan(noRec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-history-pegawai/{idPegawai}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getListHistoryPegawai(@PathVariable("idPegawai") Integer idPegawai, HttpServletRequest request) { - Map result = null; try { - - result = rekamDataPegawaiService.getListHistoryDatapegawai(idPegawai); - + Map result = rekamDataPegawaiService.getListHistoryDatapegawai(idPegawai); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/save-uraian-tugas-flexible", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUraianTugasFlexible(@Valid @RequestBody UraianTugasFlexibleVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { Map result = uraianTugasTransaksiService.saveUraianTugasFlexible(vo); if (null != result) @@ -5039,79 +4356,65 @@ public class SdmController extends LocaleController { @RequestMapping(value = "/get-list-uraian-tugas-flexible-by-date/{idPegawai}/{date}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugas(@PathVariable("idPegawai") Integer idPegawai, @PathVariable("date") String date, HttpServletRequest request) { - List> result = null; try { - - result = uraianTugasTransaksiService.findAllUraianTugasToday(idPegawai, date); - + List> result = uraianTugasTransaksiService.findAllUraianTugasToday(idPegawai, date); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-uraian-tugas-verified-monthly/{idPegawai}/{periode}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugasMonthly( @PathVariable("idPegawai") Integer idPegawai, @PathVariable("periode") String periode, HttpServletRequest request) { - List> result = null; try { - - result = uraianTugasTransaksiService.findAllUraianTugasMonthly(idPegawai, periode); - + List> result = uraianTugasTransaksiService.findAllUraianTugasMonthly(idPegawai, + periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-uraian-tugas-bawahan/{idAtasan}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListUraianTugasBawahan( @PathVariable("idAtasan") Integer idAtasan, HttpServletRequest request) { - List> result = null; try { - - result = uraianTugasTransaksiService.findAllUraianTugasBawahan(idAtasan); - + List> result = uraianTugasTransaksiService.findAllUraianTugasBawahan(idAtasan); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-all-jatah-cuti/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListJatahCuti(HttpServletRequest request) { - List> result = null; try { - - result = servicePermohonanStatus.getAllDataCuti(); - + List> result = servicePermohonanStatus.getAllDataCuti(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } @RequestMapping(value = "/get-list-penandatangan-surat-izin-cuti", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getListPenandaTanganSuratIzinCuti(HttpServletRequest request) { - List> result = null; try { - - result = monitoringAbsenService.findListPenandaTangan(); - + List> result = monitoringAbsenService.findListPenandaTangan(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK); } catch (Exception e) { - e.printStackTrace(); + return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } }