diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c994f36c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +jasamedika-web/src/main/webapp/WEB-INF/web.xml 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 d0d72d1a..45f1766d 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 @@ -204,6 +204,8 @@ public final class Master { public static final Integer KELEBIHAN_JAM_KERJA = 43; public static final Integer KELEBIHAN_TUNJANGAN = 40; public static final Integer PEMBULATAN = 42; + public static final Integer PINJAMAM_BRI_GAJI = 45; + public static final Integer PINJAMAN_BRI_REMUNERASI = 46; public static final Integer PINJAMAN_KOPERASI_GAJI = 15; public static final Integer PINJAMAN_KOPERASI_REMUNERASI = 35; public static final Integer POTONGAN_BPJSK = 20; 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 2bb1dd79..f045af2a 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 @@ -354,8 +354,9 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.nilaiJabatan as nilaiJabatan," + "levelTingkat.id as idLevelTingkat," + "levelTingkat.levelTingkat as levelTingkat," + "pegawai.grade as grade," + "pegawai.noSip as noSip," + "pegawai.tglTerbitSip as tglTerbitSip," + "pegawai.tglBerakhirSip as tglBerakhirSip," - + "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr," - + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan," + + "pegawai.isSipSeumurHidup as isSipSeumurHidup," + "pegawai.noStr as noStr," + + "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr," + + "pegawai.isStrSeumurHidup as isStrSeumurHidup," + "pegawai.gelarDepan as gelarDepan," + "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," @@ -667,7 +668,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join mapPegawai.pegawai p " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.id = :id " - + "and tglBerakhirSip <= :date " + "order by tglBerakhirSip, namaLengkap") + + "and tglBerakhirSip <= :date " + "and p.isSipSeumurHidup is false " + + "order by tglBerakhirSip, namaLengkap") Map findSipExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (p.id as id, " + "p.tglBerakhirStr as tglBerakhirStr, " @@ -677,7 +679,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join mapPegawai.pegawai p " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja " + "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true " + "and p.statusEnabled is true " + "and p.id = :id " - + "and tglBerakhirStr <= :date " + "order by tglBerakhirStr, namaLengkap") + + "and tglBerakhirStr <= :date " + "and p.isStrSeumurHidup is false " + + "order by tglBerakhirStr, namaLengkap") Map findStrExpiredByPegawai(@Param("date") Date date, @Param("id") Integer id); @Query("select new map (unitKerja.name as unitKerja, count(pegawai.id) as value )" @@ -872,7 +875,8 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "pegawai.rekananId as rekananId," + "pegawai.statusRhesus as statusRhesus, " + "pegawai.shiftKerjaId as shiftKerjaId, " + "pegawai.statusKawinId as statusKawinId, " + "pegawai.sukuId as sukuId, " + "pegawai.tempatLahir as tempatLahir, " - + "pegawai.tglBerakhirSip as tglBerakhirSip, " + "pegawai.tglBerakhirStr as tglBerakhirStr, " + + "pegawai.tglBerakhirSip as tglBerakhirSip, " + "pegawai.isSipSeumurHidup as isSipSeumurHidup, " + + "pegawai.tglBerakhirStr as tglBerakhirStr, " + "pegawai.isStrSeumurHidup as isStrSeumurHidup, " + "pegawai.tglLahir as tglLahir, " + "pegawai.tglMasuk as tglMasuk, " + "pegawai.tglkeluar as tglkeluar, " + "pegawai.tglPensiun as tglPensiun, " + "pegawai.tglTerbitSip as tglTerbitSip, " + "pegawai.tglTerbitStr as tglTerbitStr, " + "pegawai.typePegawaiId as typePegawaiId) " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java index 1495ff82..ac1813d8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java @@ -1,15 +1,5 @@ package com.jasamedika.medifirst2000.dao.custom.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.persistence.Query; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom; @@ -17,6 +7,14 @@ import com.jasamedika.medifirst2000.dao.custom.base.impl.CoreDaoImpl; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.PegawaiJadwalKerja; import com.jasamedika.medifirst2000.util.CommonUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +import javax.persistence.Query; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * Repository PegawaiDaoCustomImpl class @@ -329,8 +327,9 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl implements Pegawa + "pegawai.nilaiJabatan as nilaiJabatan," + "levelTingkat.id as idLevelTingkat," + "levelTingkat.levelTingkat as levelTingkat," + "pegawai.grade as grade," + "pegawai.noSip as noSip," + "pegawai.tglTerbitSip as tglTerbitSip," + "pegawai.tglBerakhirSip as tglBerakhirSip," - + "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr," - + "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan," + + "pegawai.isSipSeumurHidup as isSipSeumurHidup," + "pegawai.noStr as noStr," + + "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr," + + "pegawai.isStrSeumurHidup as isStrSeumurHidup," + "pegawai.gelarDepan as gelarDepan," + "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai," 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 3d43457e..1ff02b00 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 @@ -1,67 +1,11 @@ package com.jasamedika.medifirst2000.service.impl; -import java.io.UnsupportedEncodingException; -import java.security.NoSuchAlgorithmException; -import java.sql.Timestamp; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.google.gson.Gson; import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.EvaluasiJabatanDao; -import com.jasamedika.medifirst2000.dao.HistoryDataPegawaiDao; -import com.jasamedika.medifirst2000.dao.LoginUserDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.PangkatDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.PegawaiJadwalKerjaDao; -import com.jasamedika.medifirst2000.entities.Agama; -import com.jasamedika.medifirst2000.entities.DetailKategoryPegawai; -import com.jasamedika.medifirst2000.entities.Dokumen; -import com.jasamedika.medifirst2000.entities.Eselon; -import com.jasamedika.medifirst2000.entities.Golongan; -import com.jasamedika.medifirst2000.entities.GolonganDarah; -import com.jasamedika.medifirst2000.entities.GolonganPegawai; -import com.jasamedika.medifirst2000.entities.HistoryDataPegawai; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.JenisKelamin; -import com.jasamedika.medifirst2000.entities.JenisPegawai; -import com.jasamedika.medifirst2000.entities.KategoryPegawai; -import com.jasamedika.medifirst2000.entities.Kedudukan; -import com.jasamedika.medifirst2000.entities.KelompokShift; -import com.jasamedika.medifirst2000.entities.KelompokUser; -import com.jasamedika.medifirst2000.entities.KualifikasiJurusan; -import com.jasamedika.medifirst2000.entities.LevelTingkat; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.MapPegawaiJabatanToUnitKerja; -import com.jasamedika.medifirst2000.entities.Negara; -import com.jasamedika.medifirst2000.entities.NilaiKelompokJabatan; -import com.jasamedika.medifirst2000.entities.Pangkat; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Pendidikan; -import com.jasamedika.medifirst2000.entities.PenghasilanTidakKenaPajak; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.SatuanKerja; -import com.jasamedika.medifirst2000.entities.StatusPegawai; -import com.jasamedika.medifirst2000.entities.StatusPerkawinan; -import com.jasamedika.medifirst2000.entities.StatusPerkawinanPegawai; -import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai; -import com.jasamedika.medifirst2000.entities.Suku; -import com.jasamedika.medifirst2000.entities.TypePegawai; -import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.PegawaiService; import com.jasamedika.medifirst2000.service.RekamDataPegawaiService; @@ -69,46 +13,22 @@ import com.jasamedika.medifirst2000.service.RiwayatJabatanService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.PasswordUtil; -import com.jasamedika.medifirst2000.vo.AgamaVO; -import com.jasamedika.medifirst2000.vo.DetailKategoryPegawaiVO; -import com.jasamedika.medifirst2000.vo.DokumenVO; -import com.jasamedika.medifirst2000.vo.EselonVO; -import com.jasamedika.medifirst2000.vo.GolonganDarahVO; -import com.jasamedika.medifirst2000.vo.GolonganPegawaiVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.JenisKelaminVO; -import com.jasamedika.medifirst2000.vo.JenisPegawaiVO; -import com.jasamedika.medifirst2000.vo.KategoryPegawaiVO; -import com.jasamedika.medifirst2000.vo.KedudukanVO; -import com.jasamedika.medifirst2000.vo.KelompokShiftVO; -import com.jasamedika.medifirst2000.vo.KualifikasiJurusanVO; -import com.jasamedika.medifirst2000.vo.LevelTingkatVO; -import com.jasamedika.medifirst2000.vo.MapPegawaiJabatanToUnitKerjaVO; -import com.jasamedika.medifirst2000.vo.NegaraVO; -import com.jasamedika.medifirst2000.vo.NilaiKelompokJabatanVO; -import com.jasamedika.medifirst2000.vo.PangkatVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PendidikanVO; -import com.jasamedika.medifirst2000.vo.PenghasilanTidakKenaPajakVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiCustomVO; -import com.jasamedika.medifirst2000.vo.RekamDataPegawaiVO; -import com.jasamedika.medifirst2000.vo.RekananVO; -import com.jasamedika.medifirst2000.vo.RiwayatJabatanVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.SatuanKerjaVO; -import com.jasamedika.medifirst2000.vo.StatusPegawaiVO; -import com.jasamedika.medifirst2000.vo.StatusPerkawinanPegawaiVO; -import com.jasamedika.medifirst2000.vo.StatusPerkawinanVO; -import com.jasamedika.medifirst2000.vo.SubUnitKerjaPegawaiVO; -import com.jasamedika.medifirst2000.vo.SukuVO; -import com.jasamedika.medifirst2000.vo.TypePegawaiVO; -import com.jasamedika.medifirst2000.vo.UnitKerjaPegawaiVO; +import com.jasamedika.medifirst2000.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.UnsupportedEncodingException; +import java.security.NoSuchAlgorithmException; +import java.sql.Timestamp; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; /** * Implement class for RekamDataPegawaiService * * @author Generator - * @param */ @Service("rekamDataPegawaiService") public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements RekamDataPegawaiService { @@ -251,7 +171,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re @Override @Transactional public Map saveRekamDataPegawaiRev(RekamDataPegawaiVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); Pegawai pegawai = new Pegawai(); String perubahan = ""; @@ -820,7 +740,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setPangkat(pangkatConverter.transferVOToModel(vo.getPangkat(), new Pangkat())); perubahan += "ubah pangkat, "; } - /** + /* * field golongan dan golonganPegawai sudah deprecated karena * field pangkat sudah terasosiasi langsung dengan * golonganPegawai @@ -834,7 +754,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } else if (CommonUtil.isNullOrEmpty(pegawai.getPangkat()) && CommonUtil.isNotNullOrEmpty(vo.getPangkat())) { pegawai.setPangkat(pangkatConverter.transferVOToModel(vo.getPangkat(), new Pangkat())); perubahan += "pangkat, "; - /** + /* * field golongan dan golonganPegawai sudah deprecated karena * field pangkat sudah terasosiasi langsung dengan * golonganPegawai @@ -848,7 +768,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } else if (CommonUtil.isNotNullOrEmpty(pegawai.getPangkat()) && CommonUtil.isNullOrEmpty(vo.getPangkat())) { pegawai.setPangkat(null); perubahan += "hapus pangkat, "; - /** + /* * field golongan dan golonganPegawai sudah deprecated karena * field pangkat sudah terasosiasi langsung dengan * golonganPegawai @@ -1063,7 +983,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(pegawai.getPensiun()) && CommonUtil.isNotNullOrEmpty(usiaPensiun)) { if (!pegawai.getPensiun().equals(usiaPensiun)) { pegawai.setPensiun(usiaPensiun); - ; perubahan += "hitung ulang usia pensiun, "; } } else if (CommonUtil.isNullOrEmpty(pegawai.getPensiun()) @@ -1123,6 +1042,22 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re perubahan += "hapus tanggal berakhir sip, "; } + if (CommonUtil.isNotNullOrEmpty(pegawai.getIsSipSeumurHidup()) + && CommonUtil.isNotNullOrEmpty(vo.getIsSipSeumurHidup())) { + if (!pegawai.getIsSipSeumurHidup().equals(vo.getIsSipSeumurHidup())) { + pegawai.setIsSipSeumurHidup(vo.getIsSipSeumurHidup()); + perubahan += "ubah status SIP berlaku seumur hidup, "; + } + } else if (CommonUtil.isNullOrEmpty(pegawai.getIsSipSeumurHidup()) + && CommonUtil.isNotNullOrEmpty(vo.getIsSipSeumurHidup())) { + pegawai.setIsSipSeumurHidup(vo.getIsSipSeumurHidup()); + perubahan += "status SIP berlaku seumur hidup, "; + } else if (CommonUtil.isNotNullOrEmpty(pegawai.getIsSipSeumurHidup()) + && CommonUtil.isNullOrEmpty(vo.getIsSipSeumurHidup())) { + pegawai.setIsSipSeumurHidup(vo.getIsSipSeumurHidup()); + perubahan += "hapus status SIP berlaku seumur hidup, "; + } + if (CommonUtil.isNotNullOrEmpty(pegawai.getNoStr()) && CommonUtil.isNotNullOrEmpty(vo.getNoStr())) { if (!pegawai.getNoStr().equals(vo.getNoStr())) { pegawai.setNoStr(vo.getNoStr()); @@ -1168,6 +1103,22 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re perubahan += "hapus tanggal berakhir str, "; } + if (CommonUtil.isNotNullOrEmpty(pegawai.getIsStrSeumurHidup()) + && CommonUtil.isNotNullOrEmpty(vo.getIsStrSeumurHidup())) { + if (!pegawai.getIsStrSeumurHidup().equals(vo.getIsStrSeumurHidup())) { + pegawai.setIsStrSeumurHidup(vo.getIsStrSeumurHidup()); + perubahan += "ubah status STR berlaku seumur hidup, "; + } + } else if (CommonUtil.isNullOrEmpty(pegawai.getIsStrSeumurHidup()) + && CommonUtil.isNotNullOrEmpty(vo.getIsStrSeumurHidup())) { + pegawai.setIsStrSeumurHidup(vo.getIsStrSeumurHidup()); + perubahan += "status STR berlaku seumur hidup, "; + } else if (CommonUtil.isNotNullOrEmpty(pegawai.getIsStrSeumurHidup()) + && CommonUtil.isNullOrEmpty(vo.getIsStrSeumurHidup())) { + pegawai.setIsStrSeumurHidup(vo.getIsStrSeumurHidup()); + perubahan += "hapus status STR berlaku seumur hidup, "; + } + if (CommonUtil.isNotNullOrEmpty(pegawai.getTypePegawaiId()) && CommonUtil.isNotNullOrEmpty(vo.getTypePegawai())) { if (!pegawai.getTypePegawaiId().equals(vo.getTypePegawai().getId())) { @@ -1455,7 +1406,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(vo.getPangkat())) { pegawai.setPangkat(pangkatConverter.transferVOToModel(vo.getPangkat(), new Pangkat())); perubahan += "pangkat, "; - /** + /* * field golongan dan golonganPegawai sudah deprecated karena * field pangkat sudah terasosiasi langsung dengan * golonganPegawai @@ -1600,7 +1551,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } // Simpan mapping jabatan untuk pegawai baru saja - List> listMappingId = new ArrayList>(); + List> listMappingId = new ArrayList<>(); if (CommonUtil.isNotNullOrEmpty(vo.getMappingJabatan()) && CommonUtil.isNullOrEmpty(vo.getId())) { for (MapPegawaiJabatanToUnitKerjaVO mapVo : vo.getMappingJabatan()) { MapPegawaiJabatanToUnitKerja map = new MapPegawaiJabatanToUnitKerja(); @@ -1623,7 +1574,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } } if (CommonUtil.isNotNullOrEmpty(mapVo.getNilaiJabatan())) { - if (mapVo.getNilaiJabatan().equals(0)) { + if (mapVo.getNilaiJabatan() == 0.0) { mapVo.setSumberData(null); } } @@ -2057,7 +2008,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re List> lnj = mapPegawaiJabatanToUnitKerjaDao .findNilaiJabatanByPegawai(resultDomain.getId()); if (lnj.size() > 1) { - if (!Boolean.valueOf(lnj.get(0).get("isPrimary").toString())) { + if (!Boolean.parseBoolean(lnj.get(0).get("isPrimary").toString())) { mapPegawaiJabatanToUnitKerjaDao.changeIsNotPrimary(resultDomain.getId(), Integer.valueOf(lnj.get(0).get("id").toString())); mapPegawaiJabatanToUnitKerjaDao.changeIsPrimary(resultDomain.getId(), @@ -2087,9 +2038,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re @Override @Transactional public Map saveRekamDataPegawai(RekamDataPegawaiVO vo) { - Map result = new HashMap(); - Map dataPegawai = new HashMap(); - // BeanUtils.copyProperties(dest, orig); + Map result = new HashMap<>(); + Map dataPegawai = new HashMap<>(); Date currDate = new Date(); Date start = DateUtil.startMonth(currDate); @@ -2098,10 +2048,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(vo)) { try { dataPegawai = vo.ToMap(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + } catch (IllegalArgumentException | IllegalAccessException e) { + throw new ServiceVOException(e.getMessage()); } } Pegawai model = new Pegawai(); @@ -2110,13 +2058,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } String perubahan = ""; - // model = rekamDataPegawaiConverter.transferVOToModel(vo, model); - // SET DATA NEGARA - // Negara negara = new Negara(); - // negara.setId(0); - // model.setNegara(negara); - - // model.setNoIdentitas(vo.getNoIdentitas()); model.setKdProfile((short) 0); if (dataPegawai.containsKey("noIdentitas")) { @@ -2314,7 +2255,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } // Shift Kerja if (CommonUtil.isNotNullOrEmpty(vo.getShiftKerja())) { - Integer currKelShift = 0; + Integer currKelShift; if (CommonUtil.isNotNullOrEmpty(vo.getId())) { currKelShift = pegawaiDao.getKelompokShiftByIdPegawai(vo.getId()); if (CommonUtil.isNullOrEmpty(currKelShift)) { @@ -2422,22 +2363,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re model.setDokumen(dokumenLamarConverter.transferVOToModel(vo.getDokumen(), new Dokumen())); perubahan += "dokumen lamar, "; } - - // Atasan Langsung - // if (CommonUtil.isNotNullOrEmpty(vo.getAtasanLangsung())) { - // model.setAtasanLangsung( - // pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new - // Pegawai())); - // perubahan += "atasan langsung, "; - // } - // Pejabat Penilai - // if (CommonUtil.isNotNullOrEmpty(vo.getPejabatPenilai())) { - // model.setPejabatPenilai( - // pegawaiConverter.transferVOToModel(vo.getPejabatPenilai(), new - // Pegawai())); - // perubahan += "pejabat penilai, "; - // } - if (dataPegawai.containsKey("nilaiJabatan")) { model.setNilaiJabatan(vo.getNilaiJabatan()); perubahan += "nilai jabatan, "; @@ -2545,24 +2470,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re resultDomain.setQPegawai(resultDomain.getId().shortValue()); rekamDataPegawaiDao.save(resultDomain); this.saveHistoryPegawai(model, perubahan); - - // Proses pembentukan username dan password pegawai baru - // List pegId = - // loginUserDao.findAllLoginUserByIdPegawai(resultDomain.getId()); - // if (CommonUtil.isNullOrEmpty(pegId)) { - // LoginUser pegNama = loginUserDao - // .findLoginUserByNamaUser(resultDomain.getNama().toLowerCase().replace(" - // ", ".")); - // if (CommonUtil.isNullOrEmpty(pegNama)) { - // this.saveLoginUser(resultDomain, - // Master.LoginUser.GENERATED_NEW_LOGIN); - // } else { - // this.saveLoginUser(resultDomain, - // Master.LoginUser.GENERATED_USED_LOGIN); - // } - // } else { - // this.resetLoginUser(model.getId()); - // } } result.put("noRec", resultDomain.getId()); result.put("namaUser", username); @@ -2573,16 +2480,16 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re private String username; @Transactional - public String saveLoginUser(Pegawai pegawai, Integer isNew) { + public void saveLoginUser(Pegawai pegawai, Integer isNew) { LoginUser loginUser = new LoginUser(); PasswordUtil passwordUtil = new PasswordUtil(); try { - /** + /* * password default pegawai baru */ loginUser.setKataSandi(passwordUtil.encryptPassword("rsabhk79")); } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } KelompokUser kelompokUser = new KelompokUser(); kelompokUser.setId(0); @@ -2595,24 +2502,21 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re loginUser.setNamaUser(pegawai.getNama().toLowerCase().replace(" ", ".")); loginUser.setNamaExternal(pegawai.getNama().toLowerCase().replace(" ", ".")); } else if (isNew == 0) { - LoginUser cekIterasiLoginUser = new LoginUser(); - Integer str = 0; - + LoginUser cekIterasiLoginUser; + int str = 0; // check username yang sudah terpakai do { str = str + 1; cekIterasiLoginUser = loginUserDao.findLoginUserByNamaUser( - pegawai.getNama().toLowerCase().replace(" ", ".").concat(str.toString())); + pegawai.getNama().toLowerCase().replace(" ", ".").concat(Integer.toString(str))); } while (CommonUtil.isNotNullOrEmpty(cekIterasiLoginUser)); - username = pegawai.getNama().toLowerCase().replace(" ", ".").concat(str.toString()); + username = pegawai.getNama().toLowerCase().replace(" ", ".").concat(Integer.toString(str)); loginUser.setNamaUser(username); loginUser.setNamaExternal(username); } loginUserDao.save(loginUser); - - return username; } public void saveHistoryPegawai(Pegawai model, String perubahan) { @@ -2845,7 +2749,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re @Override public void resetLoginUser(Integer idPegawai) { - List allLoginUserDetail = new ArrayList(); + List allLoginUserDetail = new ArrayList<>(); List allLoginUser = loginUserDao.findAllLoginUserByIdPegawai(idPegawai); for (LoginUser loginUser : allLoginUser) { allLoginUserDetail.add(loginUserDao.findOne(loginUser.getId())); @@ -2862,9 +2766,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re @Override public Map getpegawaiStrExpiredByPegawai() { LoginUser loginUser = loginUserService.getLoginUser(); - Map result = pegawaiDao.findStrExpiredByPegawai(getNextSixMonth(), - loginUser.getPegawai().getId()); - return result; + return pegawaiDao.findStrExpiredByPegawai(getNextSixMonth(), loginUser.getPegawai().getId()); } @Override @@ -2897,12 +2799,12 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re return cal.getTime(); } - @Transactional(readOnly = false) + @Transactional public void disableIsprimary(Integer idPegawai, Integer id) { mapPegawaiJabatanToUnitKerjaDao.changeIsNotPrimary(idPegawai, id); } - @Transactional(readOnly = false) + @Transactional public void disableIsprimary(Integer idPegawai) { mapPegawaiJabatanToUnitKerjaDao.changeIsPrimary(idPegawai); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index f8170f95..a94497df 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -3237,6 +3237,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("simpananWajibKoperasiGaji", "-"); result.put("pinjamanKoperasiGaji", "-"); result.put("potonganPphRemunerasi", "-"); + result.put("pinjamanBriGaji","-"); result.put("potonganObat", "-"); result.put("potonganRawatInap", "-"); result.put("potonganRawatJalan", "-"); @@ -3244,6 +3245,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiRemunerasi", "-"); result.put("tokoKoperasi", "-"); result.put("wakafDanLainLain", "-"); + result.put("pinjamanBriRemunerasi", "-"); result.put("potonganUangMakan", "-"); BigDecimal jumlahGaji = ZERO; BigDecimal jumlahRemunerasi = ZERO; @@ -3331,6 +3333,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiGaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { result.put("potonganPphRemunerasi", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PINJAMAM_BRI_GAJI.equals(k.getIdKomponen())) { + result.put("pinjamanBriGaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { result.put("potonganObat", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) { @@ -3345,6 +3349,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("tokoKoperasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { result.put("wakafDanLainLain", nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PINJAMAN_BRI_REMUNERASI.equals(k.getIdKomponen())) { + result.put("pinjamanBriRemunerasi", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdKomponen())) { result.put("potonganUangMakan", nf.format(k.getNominal())); } @@ -3500,6 +3506,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.simpananWajibKoperasiGaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.PINJAMAN_KOPERASI_GAJI.equals(k.getIdKomponen())) { potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PINJAMAM_BRI_GAJI.equals(k.getIdKomponen())) { + potonganDtoBuilder.pinjamanBriGaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { @@ -3516,6 +3524,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.tokoKoperasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) { potonganDtoBuilder.wakafDanLainLain(nf.format(k.getNominal())); + } else if (Master.KomponenGaji.PINJAMAN_BRI_REMUNERASI.equals(k.getIdKomponen())) { + potonganDtoBuilder.pinjamanBriRemunerasi(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganUangMakan(nf.format(k.getNominal())); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java index 8d2a0171..399cb02d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java @@ -495,10 +495,10 @@ public class SlipGajiServiceImpl implements SlipGajiService { new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("statusKepegawaian"), d.get("1"), d.get("24"), d.get("25"), d.get("26"), d.get("27"), d.get("28"), d.get("29"), d.get("30"), d.get("41"), d.get("42"), d.get("2"), d.get("4"), - d.get("3"), d.get("43"), d.get("44"), d.get("22"), d.get("23"), d.get("6"), d.get("31"), - d.get("8"), d.get("21"), d.get("20"), d.get("32"), d.get("40"), d.get("33"), d.get("34"), - d.get("14"), d.get("15"), d.get("36"), d.get("37"), d.get("16"), d.get("17"), d.get("18"), - d.get("38"), d.get("35"), d.get("19"), d.get("39"), d.get("12") }); + d.get("43"), d.get("44"), d.get("22"), d.get("23"), d.get("6"), d.get("31"), d.get("8"), + d.get("21"), d.get("20"), d.get("32"), d.get("40"), d.get("33"), d.get("34"), d.get("14"), + d.get("15"), d.get("45"), d.get("36"), d.get("16"), d.get("17"), d.get("18"), d.get("38"), + d.get("35"), d.get("19"), d.get("39"), d.get("46"), d.get("12") }); } TreeMap sorted = new TreeMap<>(data); Set keyset = sorted.keySet(); diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java index da9cac4b..c582856c 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseMasterProduk.java @@ -1,16 +1,11 @@ package com.jasamedika.medifirst2000.base; -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.validator.constraints.Length; +import javax.persistence.*; +import java.io.Serializable; + /** * Base class for all entities, but using String idString as 'id' * @@ -19,20 +14,9 @@ import org.hibernate.validator.constraints.Length; @MappedSuperclass public class BaseMasterProduk extends BaseActive implements Serializable { - /** - * - */ -// private static final long serialVersionUID = -7522287859244078391L; - @Id - @GeneratedValue( - strategy=GenerationType.SEQUENCE, - generator="public.produk_m_id_seq") - @javax.persistence.SequenceGenerator( - name="public.produk_m_id_seq", - sequenceName="public.produk_m_id_seq", - allocationSize=1 - ) + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.produk_m_id_seq") + @SequenceGenerator(name = "public.produk_m_id_seq", sequenceName = "public.produk_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; @@ -57,10 +41,6 @@ public class BaseMasterProduk extends BaseActive implements Serializable { this.noRec = noRec; } -// public static long getSerialversionuid() { -// return serialVersionUID; -// } - @Length(min = 1, max = 50, message = "") @Column(name = "reportDisplay") protected String reportDisplay; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java index bfb15512..df086bc2 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java @@ -53,6 +53,10 @@ public class SlipPotonganDto { @Builder.Default private String pinjamanKoperasiGaji = "-"; + @Caption(value = "Pinjaman BRI (Gaji)") + @Builder.Default + private String pinjamanBriGaji = "-"; + @Caption(value = "Potongan PPH Remunerasi") @Builder.Default private String potonganPphRemunerasi = "-"; @@ -85,6 +89,10 @@ public class SlipPotonganDto { @Builder.Default private String wakafDanLainLain = "-"; + @Caption(value = "Pinjaman BRI (Remunerasi)") + @Builder.Default + private String pinjamanBriRemunerasi = "-"; + @Caption(value = "Potongan Uang Makan") @Builder.Default private String potonganUangMakan = "-"; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObatLayananTindakan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObatLayananTindakan.java new file mode 100644 index 00000000..9b604455 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObatLayananTindakan.java @@ -0,0 +1,57 @@ +package com.jasamedika.medifirst2000.entities; + +import com.jasamedika.medifirst2000.base.BaseTransaction; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +import static javax.persistence.FetchType.LAZY; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 15/02/2024 + */ +@Getter +@Setter +@Entity +@Table(name = "obattindakan_t") +public class ObatLayananTindakan extends BaseTransaction implements Serializable { + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "tindakanpasienfk", nullable = false) + @NotNull(message = "Tindakan pasien Tidak boleh Kosong") + @Caption(value = "Tindakan Pasien") + private PelayananPasien tindakanPasien; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "obatfk", nullable = false) + @NotNull(message = "Obat tidak boleh kosong") + @Caption(value = "Obat") + private Produk obat; + + @Column(nullable = false, columnDefinition = "numeric(6,2)") + @NotNull(message = "Jumlah obat tidak boleh kosong") + private Double jumlahObat; + + @Column(updatable = false, columnDefinition = "timestamp default current_date") + private Date tanggalDibuat; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "dibuat_pegawai_id") + @Caption(value = "Dibuat oleh pegawai") + private Pegawai dibuatOleh; + + @Column(insertable = false) + private Date tanggalDiubah; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "diubah_pengguna_id") + @Caption(value = "Diubah oleh pegawai") + private Pegawai diubahOleh; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObatTindakan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObatTindakan.java new file mode 100644 index 00000000..8f150f11 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObatTindakan.java @@ -0,0 +1,46 @@ +package com.jasamedika.medifirst2000.entities; + +import com.jasamedika.medifirst2000.base.BaseTransaction; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +import static javax.persistence.FetchType.LAZY; + +/** + * @author salmanoe + * @version 1.0.0 + * @since 15/02/2024 + */ +@Getter +@Setter +@Entity +@Table(name = "obattindakan_m") +public class ObatTindakan extends BaseTransaction implements Serializable { + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "tindakanfk", nullable = false) + @NotNull + @Caption(value = "Tindakan") + private Produk tindakan; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "obatfk", nullable = false) + @NotNull(message = "Obat tidak boleh kosong") + @Caption(value = "Obat") + private Produk obat; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "satuanfk", nullable = false) + @NotNull(message = "Satuan tidak boleh kosong") + @Caption(value = "Satuan") + private SatuanStandar satuan; + + @Column(nullable = false, columnDefinition = "numeric(6,2)") + @NotNull(message = "Jumlah obat tidak boleh kosong") + private Double jumlah; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java index a97a7e85..9aa0ce28 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java @@ -543,6 +543,10 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "tglBerakhirSip") private Date tglBerakhirSip; + @Column(nullable = false, columnDefinition = "boolean default false") + @Caption("Status SIP berlaku seumur hidup") + private Boolean isSipSeumurHidup; + @Column(name = "noStr") private String noStr; @@ -552,6 +556,10 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "tglBerakhirStr") private Date tglBerakhirStr; + @Column(nullable = false, columnDefinition = "boolean default false") + @Caption("Status STR berlaku seumur hidup") + private Boolean isStrSeumurHidup; + @JsonBackReference @OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "pegawai") private Set riwayatPendidikanSet = new HashSet<>(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java index b54cd0fd..ca371c4f 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java @@ -6,6 +6,7 @@ import com.jasamedika.medifirst2000.base.BaseMasterProduk; import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import javax.persistence.*; @@ -23,6 +24,7 @@ import static javax.persistence.FetchType.LAZY; @Getter @Setter @Entity +@NoArgsConstructor @Table(name = "Produk_M") public class Produk extends BaseMasterProduk { public Produk(String kdProduk, String namaProduk, Integer id, SatuanStandar satuanStandar) { @@ -70,10 +72,6 @@ public class Produk extends BaseMasterProduk { this.keterangan = keterangan; } - public Produk() { - - } - @JsonBackReference @OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "produk") private Set produkDetail = new HashSet<>(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SatuanStandar.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SatuanStandar.java index 564708eb..5fb2426d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SatuanStandar.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SatuanStandar.java @@ -8,6 +8,9 @@ import lombok.Setter; import javax.persistence.*; import javax.validation.constraints.NotNull; +import static javax.persistence.FetchType.LAZY; +import static javax.persistence.GenerationType.SEQUENCE; + /** * class SatuanStandar * @@ -18,7 +21,7 @@ import javax.validation.constraints.NotNull; @Entity @Table(name = "SatuanStandar_M") public class SatuanStandar extends BaseMaster { - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDepartemenFk") @Caption(value = "Object Departemen") private Departemen departemen; @@ -26,14 +29,14 @@ public class SatuanStandar extends BaseMaster { @Column(name = "ObjectDepartemenFk", insertable = false, updatable = false) private Integer departemenId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelompokProdukFk") @Caption(value = "Object Kelompok Produk") private KelompokProduk kelompokProduk; @Column(name = "ObjectKelompokProdukFk", insertable = false, updatable = false, nullable = false) private Integer kelompokProdukId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KdHeadSatuanStandard") @Caption(value = "Satuan Standar") private SatuanStandar satuanStandarHead; @@ -51,7 +54,7 @@ public class SatuanStandar extends BaseMaster { private String satuanStandar; @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.satuanstandar_m_id_seq") + @GeneratedValue(strategy = SEQUENCE, generator = "public.satuanstandar_m_id_seq") @SequenceGenerator(name = "public.satuanstandar_m_id_seq", sequenceName = "public.satuanstandar_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java index ab47607d..2e8f1a44 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java @@ -1,18 +1,22 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + import java.util.Date; import java.util.List; -import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; - /** * class RekamDataPegawaiVO * * @author Lukman Hakim * */ +@Getter +@Setter public class RekamDataPegawaiVO extends BaseTransactionVO { - private Integer id; private String nip; @@ -231,12 +235,18 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { private Date tglBerakhirSip; + @Caption("Status SIP berlaku seumur hidup") + private Boolean isSipSeumurHidup; + private String noStr; private Date tglTerbitStr; private Date tglBerakhirStr; + @Caption("Status STR berlaku seumur hidup") + private Boolean isStrSeumurHidup; + private Date tglMasuk; private Date tglRetired; @@ -268,1029 +278,4 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { private Boolean isMenanggung; private List mappingJabatan; - - public Double getGrade() { - return grade; - } - - public void setGrade(Double grade) { - this.grade = grade; - } - - public Double getNilaiJabatan() { - return nilaiJabatan; - } - - public void setNilaiJabatan(Double nilaiJabatan) { - this.nilaiJabatan = nilaiJabatan; - } - - public NilaiKelompokJabatanVO getDetailKelompokJabatan() { - return detailKelompokJabatan; - } - - public void setDetailKelompokJabatan(NilaiKelompokJabatanVO detailKelompokJabatan) { - this.detailKelompokJabatan = detailKelompokJabatan; - } - - public String getNip() { - return nip; - } - - public void setNip(String nip) { - this.nip = nip; - } - - public String getNama() { - return nama; - } - - public void setNama(String nama) { - this.nama = nama; - } - - public KedudukanVO getKedudukan() { - return kedudukan; - } - - public void setKedudukan(KedudukanVO kedudukan) { - this.kedudukan = kedudukan; - } - - public Integer getKedudukanId() { - return kedudukanId; - } - - public void setKedudukanId(Integer kedudukanId) { - this.kedudukanId = kedudukanId; - } - - public Date getTanggalMeninggal() { - return tanggalMeninggal; - } - - public void setTanggalMeninggal(Date tanggalMeninggal) { - this.tanggalMeninggal = tanggalMeninggal; - } - - public String getIdFinger() { - return idFinger; - } - - public void setIdFinger(String idFinger) { - this.idFinger = idFinger; - } - - public String getKodeGapokId() { - return kodeGapokId; - } - - public void setKodeGapokId(String kodeGapokId) { - this.kodeGapokId = kodeGapokId; - } - - public Integer getGolonganId() { - return GolonganId; - } - - public void setGolonganId(Integer golonganId) { - GolonganId = golonganId; - } - - public GolonganPegawaiVO getGolonganPegawai() { - return golonganPegawai; - } - - public void setGolonganPegawai(GolonganPegawaiVO golonganPegawai) { - this.golonganPegawai = golonganPegawai; - } - - public Integer getGolonganPegawaiId() { - return golonganPegawaiId; - } - - public void setGolonganPegawaiId(Integer golonganPegawaiId) { - this.golonganPegawaiId = golonganPegawaiId; - } - - public Integer getPensiun() { - return pensiun; - } - - public void setPensiun(Integer pensiun) { - this.pensiun = pensiun; - } - - public String getTunjanganFungsional() { - return tunjanganFungsional; - } - - public void setTunjanganFungsional(String tunjanganFungsional) { - this.tunjanganFungsional = tunjanganFungsional; - } - - public Integer getTunjanganPapua() { - return tunjanganPapua; - } - - public void setTunjanganPapua(Integer tunjanganPapua) { - this.tunjanganPapua = tunjanganPapua; - } - - public Integer getWilayahTerperinci() { - return wilayahTerperinci; - } - - public void setWilayahTerperinci(Integer wilayahTerperinci) { - this.wilayahTerperinci = wilayahTerperinci; - } - - public Integer getTunjanganUmum() { - return tunjanganUmum; - } - - public void setTunjanganUmum(Integer tunjanganUmum) { - this.tunjanganUmum = tunjanganUmum; - } - - public StatusPerkawinanVO getStatusKawin() { - return statusKawin; - } - - public void setStatusKawin(StatusPerkawinanVO statusKawin) { - this.statusKawin = statusKawin; - } - - public Integer getStatusKawinId() { - return statusKawinId; - } - - public void setStatusKawinId(Integer statusKawinId) { - this.statusKawinId = statusKawinId; - } - - public String getBeras() { - return beras; - } - - public void setBeras(String beras) { - this.beras = beras; - } - - public String getSewaRumah() { - return sewaRumah; - } - - public void setSewaRumah(String sewaRumah) { - this.sewaRumah = sewaRumah; - } - - public String getAlamat() { - return alamat; - } - - public void setAlamat(String alamat) { - this.alamat = alamat; - } - - public String getKodePos() { - return kodePos; - } - - public void setKodePos(String kodePos) { - this.kodePos = kodePos; - } - - public String getBankRekeningAtasNama() { - return bankRekeningAtasNama; - } - - public void setBankRekeningAtasNama(String bankRekeningAtasNama) { - this.bankRekeningAtasNama = bankRekeningAtasNama; - } - - public String getKodeBank() { - return kodeBank; - } - - public void setKodeBank(String kodeBank) { - this.kodeBank = kodeBank; - } - - public String getBankRekeningNama() { - return bankRekeningNama; - } - - public void setBankRekeningNama(String bankRekeningNama) { - this.bankRekeningNama = bankRekeningNama; - } - - public String getBankRekeningNomor() { - return bankRekeningNomor; - } - - public void setBankRekeningNomor(String bankRekeningNomor) { - this.bankRekeningNomor = bankRekeningNomor; - } - - public AgamaVO getAgama() { - return agama; - } - - public void setAgama(AgamaVO agama) { - this.agama = agama; - } - - public Integer getAgamaId() { - return agamaId; - } - - public void setAgamaId(Integer agamaId) { - this.agamaId = agamaId; - } - - public DetailKategoryPegawaiVO getDetailKategoryPegawai() { - return detailKategoryPegawai; - } - - public void setDetailKategoryPegawai(DetailKategoryPegawaiVO detailKategoryPegawai) { - this.detailKategoryPegawai = detailKategoryPegawai; - } - - public Integer getDetailKategoryPegawaiId() { - return detailKategoryPegawaiId; - } - - public void setDetailKategoryPegawaiId(Integer detailKategoryPegawaiId) { - this.detailKategoryPegawaiId = detailKategoryPegawaiId; - } - - public DokumenVO getDokumen() { - return dokumen; - } - - public void setDokumen(DokumenVO dokumen) { - this.dokumen = dokumen; - } - - public Integer getDokumenId() { - return dokumenId; - } - - public void setDokumenId(Integer dokumenId) { - this.dokumenId = dokumenId; - } - - public EselonVO getEselon() { - return eselon; - } - - public void setEselon(EselonVO eselon) { - this.eselon = eselon; - } - - public Integer getEselonId() { - return eselonId; - } - - public void setEselonId(Integer eselonId) { - this.eselonId = eselonId; - } - - public GolonganDarahVO getGolonganDarah() { - return golonganDarah; - } - - public void setGolonganDarah(GolonganDarahVO golonganDarah) { - this.golonganDarah = golonganDarah; - } - - public Integer getGolonganDarahId() { - return golonganDarahId; - } - - public void setGolonganDarahId(Integer golonganDarahId) { - this.golonganDarahId = golonganDarahId; - } - - public JabatanVO getJabatanFungsional() { - return jabatanFungsional; - } - - public void setJabatanFungsional(JabatanVO jabatanFungsional) { - this.jabatanFungsional = jabatanFungsional; - } - - public Integer getJabatanFungsionalId() { - return jabatanFungsionalId; - } - - public void setJabatanFungsionalId(Integer jabatanFungsionalId) { - this.jabatanFungsionalId = jabatanFungsionalId; - } - - public JabatanVO getJabatanInternal() { - return jabatanInternal; - } - - public void setJabatanInternal(JabatanVO jabatanInternal) { - this.jabatanInternal = jabatanInternal; - } - - public Integer getJabatanInternalId() { - return jabatanInternalId; - } - - public void setJabatanInternalId(Integer jabatanInternalId) { - this.jabatanInternalId = jabatanInternalId; - } - - public JabatanVO getJabatanLamar() { - return jabatanLamar; - } - - public void setJabatanLamar(JabatanVO jabatanLamar) { - this.jabatanLamar = jabatanLamar; - } - - public Integer getJabatanLamarId() { - return jabatanLamarId; - } - - public void setJabatanLamarId(Integer jabatanLamarId) { - this.jabatanLamarId = jabatanLamarId; - } - - public JabatanVO getJabatanStruktural() { - return jabatanStruktural; - } - - public void setJabatanStruktural(JabatanVO jabatanStruktural) { - this.jabatanStruktural = jabatanStruktural; - } - - public Integer getJabatanStrukturalId() { - return jabatanStrukturalId; - } - - public void setJabatanStrukturalId(Integer jabatanStrukturalId) { - this.jabatanStrukturalId = jabatanStrukturalId; - } - - public JenisKelaminVO getJenisKelamin() { - return jenisKelamin; - } - - public void setJenisKelamin(JenisKelaminVO jenisKelamin) { - this.jenisKelamin = jenisKelamin; - } - - public Integer getJenisKelaminId() { - return jenisKelaminId; - } - - public void setJenisKelaminId(Integer jenisKelaminId) { - this.jenisKelaminId = jenisKelaminId; - } - - public JenisPegawaiVO getJenisPegawai() { - return jenisPegawai; - } - - public void setJenisPegawai(JenisPegawaiVO jenisPegawai) { - this.jenisPegawai = jenisPegawai; - } - - public Integer getJenisPegawaiId() { - return jenisPegawaiId; - } - - public void setJenisPegawaiId(Integer jenisPegawaiId) { - this.jenisPegawaiId = jenisPegawaiId; - } - - public JenisPegawaiVO getJenisPegawaiLamar() { - return jenisPegawaiLamar; - } - - public void setJenisPegawaiLamar(JenisPegawaiVO jenisPegawaiLamar) { - this.jenisPegawaiLamar = jenisPegawaiLamar; - } - - public Integer getJenisPegawaiLamarId() { - return jenisPegawaiLamarId; - } - - public void setJenisPegawaiLamarId(Integer jenisPegawaiLamarId) { - this.jenisPegawaiLamarId = jenisPegawaiLamarId; - } - - public KualifikasiJurusanVO getKualifikasiJurusan() { - return kualifikasiJurusan; - } - - public void setKualifikasiJurusan(KualifikasiJurusanVO kualifikasiJurusan) { - this.kualifikasiJurusan = kualifikasiJurusan; - } - - public Integer getKualifikasiJurusanId() { - return kualifikasiJurusanId; - } - - public void setKualifikasiJurusanId(Integer kualifikasiJurusanId) { - this.kualifikasiJurusanId = kualifikasiJurusanId; - } - - public NegaraVO getNegara() { - return negara; - } - - public void setNegara(NegaraVO negara) { - this.negara = negara; - } - - public Integer getNegaraId() { - return negaraId; - } - - public void setNegaraId(Integer negaraId) { - this.negaraId = negaraId; - } - - public PangkatVO getPangkat() { - return pangkat; - } - - public void setPangkat(PangkatVO pangkat) { - this.pangkat = pangkat; - } - - public Integer getPangkatId() { - return pangkatId; - } - - public void setPangkatId(Integer pangkatId) { - this.pangkatId = pangkatId; - } - - public PendidikanVO getPendidikan() { - return pendidikan; - } - - public void setPendidikan(PendidikanVO pendidikan) { - this.pendidikan = pendidikan; - } - - public Integer getPendidikanId() { - return pendidikanId; - } - - public void setPendidikanId(Integer pendidikanId) { - this.pendidikanId = pendidikanId; - } - - public PenghasilanTidakKenaPajakVO getPenghasilanTidakKenaPajak() { - return penghasilanTidakKenaPajak; - } - - public void setPenghasilanTidakKenaPajak(PenghasilanTidakKenaPajakVO penghasilanTidakKenaPajak) { - this.penghasilanTidakKenaPajak = penghasilanTidakKenaPajak; - } - - public Integer getPenghasilanTidakKenaPajakId() { - return penghasilanTidakKenaPajakId; - } - - public void setPenghasilanTidakKenaPajakId(Integer penghasilanTidakKenaPajakId) { - this.penghasilanTidakKenaPajakId = penghasilanTidakKenaPajakId; - } - - public RangeVO getRange() { - return range; - } - - public void setRange(RangeVO range) { - this.range = range; - } - - public Integer getRangeId() { - return rangeId; - } - - public void setRangeId(Integer rangeId) { - this.rangeId = rangeId; - } - - public RuanganVO getRuangan() { - return ruangan; - } - - public void setRuangan(RuanganVO ruangan) { - this.ruangan = ruangan; - } - - public Integer getRuanganId() { - return ruanganId; - } - - public void setRuanganId(Integer ruanganId) { - this.ruanganId = ruanganId; - } - - public KelompokShiftVO getShiftKerja() { - return shiftKerja; - } - - public void setShiftKerja(KelompokShiftVO shiftKerja) { - this.shiftKerja = shiftKerja; - } - - public Integer getShiftKerjaId() { - return shiftKerjaId; - } - - public void setShiftKerjaId(Integer shiftKerjaId) { - this.shiftKerjaId = shiftKerjaId; - } - - public KategoryPegawaiVO getKategoryPegawai() { - return kategoryPegawai; - } - - public void setKategoryPegawai(KategoryPegawaiVO kategoryPegawai) { - this.kategoryPegawai = kategoryPegawai; - } - - public Integer getKategoryPegawaiId() { - return kategoryPegawaiId; - } - - public void setKategoryPegawaiId(Integer kategoryPegawaiId) { - this.kategoryPegawaiId = kategoryPegawaiId; - } - - public StatusPegawaiVO getStatusPegawai() { - return statusPegawai; - } - - public void setStatusPegawai(StatusPegawaiVO statusPegawai) { - this.statusPegawai = statusPegawai; - } - - public Integer getStatusPegawaiId() { - return statusPegawaiId; - } - - public void setStatusPegawaiId(Integer statusPegawaiId) { - this.statusPegawaiId = statusPegawaiId; - } - - public StatusPerkawinanPegawaiVO getStatusPerkawinanPegawai() { - return statusPerkawinanPegawai; - } - - public void setStatusPerkawinanPegawai(StatusPerkawinanPegawaiVO statusPerkawinanPegawai) { - this.statusPerkawinanPegawai = statusPerkawinanPegawai; - } - - public Integer getStatusPerkawinanPegawaiId() { - return statusPerkawinanPegawaiId; - } - - public void setStatusPerkawinanPegawaiId(Integer statusPerkawinanPegawaiId) { - this.statusPerkawinanPegawaiId = statusPerkawinanPegawaiId; - } - - public SukuVO getSuku() { - return suku; - } - - public void setSuku(SukuVO suku) { - this.suku = suku; - } - - public Integer getSukuId() { - return sukuId; - } - - public void setSukuId(Integer sukuId) { - this.sukuId = sukuId; - } - - public TitlePasienVO getTitlePasien() { - return titlePasien; - } - - public void setTitlePasien(TitlePasienVO titlePasien) { - this.titlePasien = titlePasien; - } - - public Integer getTitlePasienId() { - return titlePasienId; - } - - public void setTitlePasienId(Integer titlePasienId) { - this.titlePasienId = titlePasienId; - } - - public TypePegawaiVO getTypePegawai() { - return typePegawai; - } - - public void setTypePegawai(TypePegawaiVO typePegawai) { - this.typePegawai = typePegawai; - } - - public Integer getTypePegawaiId() { - return typePegawaiId; - } - - public void setTypePegawaiId(Integer typePegawaiId) { - this.typePegawaiId = typePegawaiId; - } - - public String getNamaKeluarga() { - return namaKeluarga; - } - - public void setNamaKeluarga(String namaKeluarga) { - this.namaKeluarga = namaKeluarga; - } - - public String getNamaLengkap() { - return namaLengkap; - } - - public void setNamaLengkap(String namaLengkap) { - this.namaLengkap = namaLengkap; - } - - public String getNamaPanggilan() { - return namaPanggilan; - } - - public void setNamaPanggilan(String namaPanggilan) { - this.namaPanggilan = namaPanggilan; - } - - public String getNikIntern() { - return nikIntern; - } - - public void setNikIntern(String nikIntern) { - this.nikIntern = nikIntern; - } - - public String getNipPns() { - return nipPns; - } - - public void setNipPns(String nipPns) { - this.nipPns = nipPns; - } - - public String getNoIdentitas() { - return noIdentitas; - } - - public void setNoIdentitas(String noIdentitas) { - this.noIdentitas = noIdentitas; - } - - public String getNoCm() { - return noCm; - } - - public void setNoCm(String noCm) { - this.noCm = noCm; - } - - public Integer getNoStruk_TTujuanLastId() { - return noStruk_TTujuanLastId; - } - - public void setNoStruk_TTujuanLastId(Integer noStruk_TTujuanLastId) { - this.noStruk_TTujuanLastId = noStruk_TTujuanLastId; - } - - public String getNpwp() { - return npwp; - } - - public void setNpwp(String npwp) { - this.npwp = npwp; - } - - public String getPhotoDiri() { - return photoDiri; - } - - public void setPhotoDiri(String photoDiri) { - this.photoDiri = photoDiri; - } - - public short getqPegawai() { - return qPegawai; - } - - public void setqPegawai(short qPegawai) { - this.qPegawai = qPegawai; - } - - public Byte getQtyAnak() { - return qtyAnak; - } - - public void setQtyAnak(Byte qtyAnak) { - this.qtyAnak = qtyAnak; - } - - public Byte getQtyTanggungan() { - return qtyTanggungan; - } - - public void setQtyTanggungan(Byte qtyTanggungan) { - this.qtyTanggungan = qtyTanggungan; - } - - public Byte getQtyTotalJiwa() { - return qtyTotalJiwa; - } - - public void setQtyTotalJiwa(Byte qtyTotalJiwa) { - this.qtyTotalJiwa = qtyTotalJiwa; - } - - public String getStatusRhesus() { - return statusRhesus; - } - - public void setStatusRhesus(String statusRhesus) { - this.statusRhesus = statusRhesus; - } - - public String getTempatLahir() { - return tempatLahir; - } - - public void setTempatLahir(String tempatLahir) { - this.tempatLahir = tempatLahir; - } - - public Double getTotalNilaiScore() { - return totalNilaiScore; - } - - public void setTotalNilaiScore(Double totalNilaiScore) { - this.totalNilaiScore = totalNilaiScore; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getEmailAlternatif() { - return emailAlternatif; - } - - public void setEmailAlternatif(String emailAlternatif) { - this.emailAlternatif = emailAlternatif; - } - - public String getNoTlp() { - return noTlp; - } - - public void setNoTlp(String noTlp) { - this.noTlp = noTlp; - } - - public String getNoHandphone() { - return noHandphone; - } - - public void setNoHandphone(String noHandphone) { - this.noHandphone = noHandphone; - } - - public Date getTglkeluar() { - return tglkeluar; - } - - public void setTglkeluar(Date tglkeluar) { - this.tglkeluar = tglkeluar; - } - - public Date getTglMasuk() { - return tglMasuk; - } - - public void setTglMasuk(Date tglMasuk) { - this.tglMasuk = tglMasuk; - } - - public Date getTglLahir() { - return tglLahir; - } - - public void setTglLahir(Date tglLahir) { - this.tglLahir = tglLahir; - } - - public String getNoBPJS() { - return noBPJS; - } - - public void setNoBPJS(String noBPJS) { - this.noBPJS = noBPJS; - } - - public SatuanKerjaVO getSatuanKerja() { - return satuanKerja; - } - - public void setSatuanKerja(SatuanKerjaVO satuanKerja) { - this.satuanKerja = satuanKerja; - } - - public Integer getSatuanKerjaId() { - return satuanKerjaId; - } - - public void setSatuanKerjaId(Integer satuanKerjaId) { - this.satuanKerjaId = satuanKerjaId; - } - - public RekananVO getRekanan() { - return rekanan; - } - - public void setRekanan(RekananVO rekanan) { - this.rekanan = rekanan; - } - - public Integer getRekananId() { - return rekananId; - } - - public void setRekananId(Integer rekananId) { - this.rekananId = rekananId; - } - - public PeriodePengajarVO getPeriodePengajar() { - return periodePengajar; - } - - public void setPeriodePengajar(PeriodePengajarVO periodePengajar) { - this.periodePengajar = periodePengajar; - } - - public String getPeriodePengajarId() { - return periodePengajarId; - } - - public void setPeriodePengajarId(String periodePengajarId) { - this.periodePengajarId = periodePengajarId; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public SubUnitKerjaPegawaiVO getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(SubUnitKerjaPegawaiVO unitKerja) { - this.unitKerja = unitKerja; - } - - public Date getTglPensiun() { - return tglPensiun; - } - - public Date getTglRetired() { - return tglRetired; - } - - public void setTglRetired(Date tglRetired) { - this.tglRetired = tglRetired; - } - - public void setTglPensiun(Date tglPensiun) { - this.tglPensiun = tglPensiun; - } - - public String getGelarDepan() { - return gelarDepan; - } - - public void setGelarDepan(String gelarDepan) { - this.gelarDepan = gelarDepan; - } - - public String getGelarBelakang() { - return gelarBelakang; - } - - public void setGelarBelakang(String gelarBelakang) { - this.gelarBelakang = gelarBelakang; - } - - public String getNoSip() { - return noSip; - } - - public void setNoSip(String noSip) { - this.noSip = noSip; - } - - public Date getTglTerbitSip() { - return tglTerbitSip; - } - - public void setTglTerbitSip(Date tglTerbitSip) { - this.tglTerbitSip = tglTerbitSip; - } - - public Date getTglBerakhirSip() { - return tglBerakhirSip; - } - - public void setTglBerakhirSip(Date tglBerakhirSip) { - this.tglBerakhirSip = tglBerakhirSip; - } - - public String getNoStr() { - return noStr; - } - - public void setNoStr(String noStr) { - this.noStr = noStr; - } - - public Date getTglTerbitStr() { - return tglTerbitStr; - } - - public void setTglTerbitStr(Date tglTerbitStr) { - this.tglTerbitStr = tglTerbitStr; - } - - public Date getTglBerakhirStr() { - return tglBerakhirStr; - } - - public void setTglBerakhirStr(Date tglBerakhirStr) { - this.tglBerakhirStr = tglBerakhirStr; - } - - public LevelTingkatVO getLevelTingkat() { - return levelTingkat; - } - - public void setLevelTingkat(LevelTingkatVO levelTingkat) { - this.levelTingkat = levelTingkat; - } - - public Boolean getIsMenanggung() { - return isMenanggung; - } - - public void setIsMenanggung(Boolean isMenanggung) { - this.isMenanggung = isMenanggung; - } - - public PegawaiVO getPegawaiPembimbing() { - return pegawaiPembimbing; - } - - public void setPegawaiPembimbing(PegawaiVO pegawaiPembimbing) { - this.pegawaiPembimbing = pegawaiPembimbing; - } - - public Integer getPegawaiPembimbingId() { - return pegawaiPembimbingId; - } - - public void setPegawaiPembimbingId(Integer pegawaiPembimbingId) { - this.pegawaiPembimbingId = pegawaiPembimbingId; - } - - public List getMappingJabatan() { - return mappingJabatan; - } - - public void setMappingJabatan(List mappingJabatan) { - this.mappingJabatan = mappingJabatan; - } - -} \ No newline at end of file +} diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/images/Logo-RSABHK-01.png b/jasamedika-reporting/src/main/webapp/WEB-INF/images/Logo-RSABHK-01.png new file mode 100644 index 00000000..548c8f14 Binary files /dev/null and b/jasamedika-reporting/src/main/webapp/WEB-INF/images/Logo-RSABHK-01.png differ diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-RSABHK-01.png b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-RSABHK-01.png new file mode 100644 index 00000000..548c8f14 Binary files /dev/null and b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/images/Logo-RSABHK-01.png differ diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 21290ed7..dcb2c6c3 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -1,5 +1,5 @@ - + @@ -59,20 +59,22 @@ + + - - + + - + - + - + @@ -87,9 +89,13 @@ + + + + - + @@ -99,7 +105,7 @@ - + @@ -109,7 +115,7 @@ - + @@ -117,10 +123,10 @@ - + - + @@ -130,7 +136,7 @@ - + @@ -141,18 +147,18 @@ - + - + - + @@ -160,7 +166,7 @@ - + @@ -168,16 +174,16 @@ - + - + - + @@ -188,7 +194,7 @@ - + @@ -198,18 +204,18 @@ - + - + - + @@ -223,7 +229,7 @@ - + @@ -237,7 +243,7 @@ - + @@ -248,10 +254,10 @@ - + - + @@ -259,7 +265,7 @@ - + @@ -267,18 +273,18 @@ - + - + - + @@ -292,7 +298,7 @@ - + @@ -306,7 +312,7 @@ - + @@ -317,20 +323,89 @@ - + - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -342,7 +417,7 @@ - + @@ -358,7 +433,7 @@ - + @@ -371,7 +446,7 @@ - + @@ -384,7 +459,7 @@ - + @@ -397,7 +472,7 @@ - + @@ -414,7 +489,7 @@ - + @@ -426,7 +501,7 @@ - + @@ -436,7 +511,7 @@ - + @@ -447,7 +522,7 @@ - + @@ -463,7 +538,7 @@ - + @@ -473,7 +548,7 @@ - + @@ -483,7 +558,7 @@ - + @@ -494,7 +569,7 @@ - + @@ -510,7 +585,7 @@ - + @@ -520,7 +595,7 @@ - + @@ -530,7 +605,7 @@ - + @@ -541,7 +616,7 @@ - + @@ -557,7 +632,7 @@ - + @@ -567,7 +642,7 @@ - + @@ -577,7 +652,7 @@ - + @@ -588,7 +663,7 @@ - + @@ -604,7 +679,7 @@ - + @@ -614,7 +689,7 @@ - + @@ -624,7 +699,7 @@ - + @@ -634,7 +709,7 @@ - + @@ -649,7 +724,7 @@ - + @@ -661,7 +736,7 @@ - + @@ -672,7 +747,7 @@ - + @@ -682,7 +757,7 @@ - + @@ -697,7 +772,7 @@ - + @@ -709,7 +784,7 @@ - + @@ -719,7 +794,7 @@ - + @@ -729,7 +804,7 @@ - + @@ -744,7 +819,7 @@ - + @@ -756,7 +831,7 @@ - + @@ -766,7 +841,7 @@ - + @@ -781,7 +856,7 @@ - + @@ -793,7 +868,7 @@ - + @@ -803,7 +878,7 @@ - + @@ -818,7 +893,7 @@ - + @@ -831,7 +906,7 @@ - + @@ -843,7 +918,7 @@ - + @@ -855,7 +930,7 @@ - + @@ -870,7 +945,7 @@ - + @@ -883,7 +958,7 @@ - + @@ -898,7 +973,7 @@ - + @@ -914,7 +989,7 @@ - + @@ -925,7 +1000,7 @@ - + @@ -938,7 +1013,7 @@ - + @@ -948,7 +1023,7 @@ - + @@ -964,7 +1039,7 @@ - + @@ -974,7 +1049,7 @@ - + @@ -985,7 +1060,7 @@ - + @@ -1000,7 +1075,7 @@ - + @@ -1010,7 +1085,7 @@ - + @@ -1021,7 +1096,7 @@ - + @@ -1036,7 +1111,7 @@ - + @@ -1046,7 +1121,7 @@ - + @@ -1057,7 +1132,7 @@ - + @@ -1072,7 +1147,7 @@ - + @@ -1084,7 +1159,7 @@ - + @@ -1094,7 +1169,7 @@ - + @@ -1110,7 +1185,7 @@ - + @@ -1122,7 +1197,7 @@ - + @@ -1132,7 +1207,7 @@ - + @@ -1148,7 +1223,7 @@ - + @@ -1158,7 +1233,7 @@ - + @@ -1166,7 +1241,7 @@ - + @@ -1182,7 +1257,7 @@ - + @@ -1192,7 +1267,7 @@ - + @@ -1203,7 +1278,7 @@ - + @@ -1214,7 +1289,7 @@ - + @@ -1229,7 +1304,7 @@ - + @@ -1242,7 +1317,7 @@ - + @@ -1254,7 +1329,7 @@ - + @@ -1266,7 +1341,7 @@ - + @@ -1281,7 +1356,7 @@ - + @@ -1294,7 +1369,7 @@ - + @@ -1309,7 +1384,7 @@ - + @@ -1325,7 +1400,7 @@ - + @@ -1336,7 +1411,7 @@ - + @@ -1349,7 +1424,7 @@ - + @@ -1359,7 +1434,7 @@ - + @@ -1375,7 +1450,7 @@ - + @@ -1388,7 +1463,7 @@ - + @@ -1403,7 +1478,7 @@ - + @@ -1417,7 +1492,7 @@ - + @@ -1432,7 +1507,7 @@ - + @@ -1443,7 +1518,7 @@ - + @@ -1454,7 +1529,7 @@ - + @@ -1464,7 +1539,7 @@ - + @@ -1475,7 +1550,7 @@ - + @@ -1486,7 +1561,7 @@ - + @@ -1497,7 +1572,7 @@ - + @@ -1508,7 +1583,7 @@ - + @@ -1518,7 +1593,7 @@ - + @@ -1529,7 +1604,7 @@ - + @@ -1542,7 +1617,7 @@ - + @@ -1555,7 +1630,7 @@ - + @@ -1568,7 +1643,7 @@ - + @@ -1582,7 +1657,7 @@ - + @@ -1598,7 +1673,7 @@ - + @@ -1614,7 +1689,7 @@ - + @@ -1630,7 +1705,7 @@ - + @@ -1644,7 +1719,7 @@ - + @@ -1659,7 +1734,7 @@ - + @@ -1670,7 +1745,7 @@ - + @@ -1686,7 +1761,7 @@ - + @@ -1696,7 +1771,7 @@ - + @@ -1706,7 +1781,7 @@ - + @@ -1716,7 +1791,7 @@ - + @@ -1724,7 +1799,7 @@ - + @@ -1732,7 +1807,7 @@ - + @@ -1740,28 +1815,108 @@ - + - - + + - + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +