From 882240283ab1b1d3d279fa22e818a8693560ca1f Mon Sep 17 00:00:00 2001 From: salmanoe Date: Thu, 4 Feb 2021 17:32:10 +0700 Subject: [PATCH] perbaikan service update otomatis nilai jabatan, grade, dan kelompok jabatan --- ...pPegawaiJabatanToUnitKerjaServiceImpl.java | 46 ++++++++++++------- .../impl/RekamDataPegawaiServiceImpl.java | 4 -- .../main/resources/jdbc.localhost.properties | 25 ++++++++++ 3 files changed, 54 insertions(+), 21 deletions(-) create mode 100644 jasamedika-config/src/main/resources/jdbc.localhost.properties diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java index e701c0fc..6840fb49 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java @@ -117,11 +117,12 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata Map tmp = new HashMap<>(); MapPegawaiJabatanToUnitKerja map = new MapPegawaiJabatanToUnitKerja(); + Pegawai pegawai = new Pegawai(); if (CommonUtil.isNotNullOrEmpty(vo.getId())) { map = mapPegawaiJabatanToUnitKerjaDao.findOne(vo.getId()); // get_kategory_pegawai - Pegawai pegawai = pegawaiDao.findOne(map.getPegawaiId()); + pegawai = pegawaiDao.findOne(map.getPegawaiId()); idKategoryPegawai = pegawai.getKategoryPegawaiId(); } if (CommonUtil.isNotNullOrEmpty(map.getId())) { @@ -257,17 +258,22 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata listResult.add(tmp); // update_komponen_evaluasi_jabatan - if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { - Map evaluasiJabatan = this.getEvaluasiJabatanByPegawai(vo.getPegawai().getId()); - Pegawai pegawai = new Pegawai(); - pegawai.setId(vo.getPegawai().getId()); - pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString())); - pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString())); - NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan(); - detailKelompokJabatan - .setId(Integer.valueOf(evaluasiJabatan.get("idDetailKelompokJabatan").toString())); - pegawai.setDetailKelompokJabatan(detailKelompokJabatan); + if (CommonUtil.isNotNullOrEmpty(map.getPegawaiId())) { + Map evaluasiJabatan = this.getEvaluasiJabatanByPegawai(map.getPegawaiId()); + pegawai.setId(map.getPegawaiId()); + if (CommonUtil.isNotNullOrEmpty(evaluasiJabatan)) { + pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString())); + pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString())); + NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan(); + detailKelompokJabatan + .setId(Integer.valueOf(evaluasiJabatan.get("idDetailKelompokJabatan").toString())); + pegawai.setDetailKelompokJabatan(detailKelompokJabatan); + } else { + pegawai.setNilaiJabatan(null); + pegawai.setGrade(null); + pegawai.setDetailKelompokJabatan(null); + } Pegawai rs = pegawaiDao.save(pegawai); if (CommonUtil.isNotNullOrEmpty(rs)) { listResult.add(evaluasiJabatan); @@ -669,12 +675,18 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { Map evaluasiJabatan = this.getEvaluasiJabatanByPegawai(vo.getPegawai().getId()); pegawai.setId(vo.getPegawai().getId()); - pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString())); - pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString())); - NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan(); - detailKelompokJabatan.setId(Integer.valueOf(evaluasiJabatan.get("idDetailKelompokJabatan").toString())); - pegawai.setDetailKelompokJabatan(detailKelompokJabatan); - + if (CommonUtil.isNotNullOrEmpty(evaluasiJabatan)) { + pegawai.setNilaiJabatan(Double.valueOf(evaluasiJabatan.get("nilaiJabatan").toString())); + pegawai.setGrade(Double.valueOf(evaluasiJabatan.get("grade").toString())); + NilaiKelompokJabatan detailKelompokJabatan = new NilaiKelompokJabatan(); + detailKelompokJabatan + .setId(Integer.valueOf(evaluasiJabatan.get("idDetailKelompokJabatan").toString())); + pegawai.setDetailKelompokJabatan(detailKelompokJabatan); + } else { + pegawai.setNilaiJabatan(null); + pegawai.setGrade(null); + pegawai.setDetailKelompokJabatan(null); + } Pegawai rs = pegawaiDao.save(pegawai); if (CommonUtil.isNotNullOrEmpty(rs)) { listResult.add(evaluasiJabatan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 1b2cd019..aca26cc8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -1426,9 +1426,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setDetailKelompokJabatan(detailkelompokJabatanConverter .transferVOToModel(vo.getDetailKelompokJabatan(), new NilaiKelompokJabatan())); perubahan += "kelompok jabatan, "; - - pegawai.setGrade(Double.parseDouble(vo.getDetailKelompokJabatan().getGrade().toString())); - perubahan += "grade, "; } if (CommonUtil.isNotNullOrEmpty(vo.getPangkat())) { pegawai.setPangkat(pangkatConverter.transferVOToModel(vo.getPangkat(), new Pangkat())); @@ -2703,7 +2700,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } return model; - } @Override diff --git a/jasamedika-config/src/main/resources/jdbc.localhost.properties b/jasamedika-config/src/main/resources/jdbc.localhost.properties new file mode 100644 index 00000000..3b3cbed1 --- /dev/null +++ b/jasamedika-config/src/main/resources/jdbc.localhost.properties @@ -0,0 +1,25 @@ +jdbc.driver = org.postgresql.Driver + +hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +hibernate.hbm2ddl = none +hibernate.format_sql = false +hibernate.show_sql = false + +hikari.config.maximum.pool.size = 5 + +# DB Development +jdbc.url = jdbc:postgresql://localhost:5432/backup_31Jan21 +jdbc.username = postgres +jdbc.password = root +jdbc.serverName = localhost +jdbc.databaseName = backup_31Jan21 +jdbc.portNumber = 5432 + +corePoolSizeAsyncConfigurer = 5 +maxPoolSizeAsyncConfigurer = 5 + +presensiCapturePath=//tmp// +reportDirectory=/home/svradmin/app-back/uploadfile/ + +urlServiceSarPras=http://192.168.12.3:8080/jasamedika-web/ +urlService=http://192.168.12.3:5555/simrs_harkit/service/transaksi/ \ No newline at end of file