diff --git a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml index 2a5abdc8..04f43c08 100644 --- a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml +++ b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml @@ -414,6 +414,7 @@ + @@ -651,6 +652,8 @@ + + @@ -1582,8 +1585,7 @@ - + diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java new file mode 100644 index 00000000..4f889106 --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java @@ -0,0 +1,12 @@ +package com.jasamedika.medifirst2000.dao; + +import com.jasamedika.medifirst2000.entities.GolonganPPPK; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * @author Salman + * @version 1.0.0 + * @since 2/21/2025 + */ +public interface GolonganPPPKDao extends JpaRepository { +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenjangGolonganPPPKDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenjangGolonganPPPKDao.java new file mode 100644 index 00000000..75c0fd8f --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenjangGolonganPPPKDao.java @@ -0,0 +1,13 @@ +package com.jasamedika.medifirst2000.dao; + +import com.jasamedika.medifirst2000.entities.JenjangGolonganId; +import com.jasamedika.medifirst2000.entities.JenjangGolonganPPPK; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * @author Salman + * @version 1.0.0 + * @since 2/21/2025 + */ +public interface JenjangGolonganPPPKDao extends JpaRepository { +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenjangPPPKDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenjangPPPKDao.java new file mode 100644 index 00000000..8689a077 --- /dev/null +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JenjangPPPKDao.java @@ -0,0 +1,12 @@ +package com.jasamedika.medifirst2000.dao; + +import com.jasamedika.medifirst2000.entities.JenjangPPPK; +import org.springframework.data.jpa.repository.JpaRepository; + +/** + * @author Salman + * @version 1.0.0 + * @since 2/21/2025 + */ +public interface JenjangPPPKDao extends JpaRepository { +} diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelatihanPaketServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelatihanPaketServiceImpl.java index 4f89a15b..9651c163 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelatihanPaketServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelatihanPaketServiceImpl.java @@ -1,52 +1,22 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dao.custom.PelatihanPaketDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.PelatihanPaketService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.StringUtil; +import com.jasamedika.medifirst2000.vo.*; +import org.apache.commons.beanutils.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.lang.reflect.InvocationTargetException; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.commons.beanutils.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.MapPelatihanPaketToJabatanDao; -import com.jasamedika.medifirst2000.dao.PelatihanJplDao; -import com.jasamedika.medifirst2000.dao.PelatihanKreditAkreditasiDao; -import com.jasamedika.medifirst2000.dao.PelatihanPaketDao; -import com.jasamedika.medifirst2000.dao.PlanningDiklatHumasMarketBiayaDao; -import com.jasamedika.medifirst2000.dao.PlanningDiklatHumasMarketDao; -import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.StrukPlanningDao; -import com.jasamedika.medifirst2000.dao.custom.PelatihanPaketDaoCustom; -import com.jasamedika.medifirst2000.entities.DetailJenisProduk; -import com.jasamedika.medifirst2000.entities.Eselon; -import com.jasamedika.medifirst2000.entities.GolonganPegawai; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.JenisPelatihan; -import com.jasamedika.medifirst2000.entities.MapPelatihanPaketToJabatan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PelatihanJpl; -import com.jasamedika.medifirst2000.entities.PelatihanKreditAkreditasi; -import com.jasamedika.medifirst2000.entities.PelatihanPaket; -import com.jasamedika.medifirst2000.entities.PlanningDiklatHumasMarket; -import com.jasamedika.medifirst2000.entities.PlanningDiklatHumasMarketBiaya; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.StatusPekerjaan; -import com.jasamedika.medifirst2000.entities.StrukPlanning; -import com.jasamedika.medifirst2000.service.PelatihanPaketService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.EselonVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.JenisPelatihanVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PelatihanJplVO; -import com.jasamedika.medifirst2000.vo.PelatihanKreditAkreditasiVO; -import com.jasamedika.medifirst2000.vo.PelatihanPaketBiayaVO; -import com.jasamedika.medifirst2000.vo.PelatihanPaketVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; - @Service("pelatihanPaketService") public class PelatihanPaketServiceImpl extends BaseAngaranServiceImpl implements PelatihanPaketService { @@ -148,10 +118,10 @@ public class PelatihanPaketServiceImpl extends BaseAngaranServiceImpl implements if (CommonUtil.isNotNullOrEmpty(pelatihanJpl.getEselon())) { entity.setEselon(eselonConverter.transferVOToModel(pelatihanJpl.getEselon(), new Eselon())); } - if (CommonUtil.isNotNullOrEmpty(pelatihanJpl.getGolongan())) { + if (CommonUtil.isNotNullOrEmpty(pelatihanJpl.getGolonganPegawai())) { GolonganPegawai golPeg = new GolonganPegawai(); try { - BeanUtils.copyProperties(pelatihanJpl.getGolongan(), golPeg); + BeanUtils.copyProperties(pelatihanJpl.getGolonganPegawai(), golPeg); } catch (IllegalAccessException e) { e.printStackTrace(); } catch (InvocationTargetException e) { 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 097b74ee..a941bae7 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 @@ -66,6 +66,9 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re @Autowired private BaseConverterImpl golonganPegawaiConverter; + @Autowired + private BaseConverterImpl golonganPPPKConverter; + @Autowired private BaseConverterImpl agamaConverter; @@ -780,6 +783,19 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setGolonganPegawai(null); } + if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPPPKId()) && CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) { + if (!pegawai.getGolonganPPPKId().equals(vo.getGolonganPPPK().getId())) { + pegawai.setGolonganPPPK(golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK())); + perubahan += "ubah golongan pppk, "; + } + } else if (CommonUtil.isNullOrEmpty(pegawai.getGolonganPPPKId()) && CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) { + pegawai.setGolonganPPPK(golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK())); + perubahan += "golongan pppk, "; + } else if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPPPKId()) && CommonUtil.isNullOrEmpty(vo.getGolonganPPPK())) { + pegawai.setGolonganPPPK(null); + perubahan += "hapus golongan pppk, "; + } + if (CommonUtil.isNotNullOrEmpty(pegawai.getEselonId()) && CommonUtil.isNotNullOrEmpty(vo.getEselon())) { if (!pegawai.getEselonId().equals(vo.getEselon().getId())) { pegawai.setEselon(eselonConverter.transferVOToModel(vo.getEselon(), new Eselon())); @@ -1434,6 +1450,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re gol.setId(gp.getId()); pegawai.setGolongan(gol); } + if (CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) { + pegawai.setGolonganPPPK(golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK())); + perubahan += "golongan pppk, "; + } if (CommonUtil.isNotNullOrEmpty(vo.getEselon())) { pegawai.setEselon(eselonConverter.transferVOToModel(vo.getEselon(), new Eselon())); perubahan += "eselon, "; @@ -2196,6 +2216,12 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re golonganPegawaiConverter.transferVOToModel(vo.getGolonganPegawai(), new GolonganPegawai())); perubahan += "golongan, "; } + // Golongan PPPK + if (CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) { + model.setGolonganPPPK( + golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK())); + perubahan += "golongan pppk, "; + } // Jabatan Internal if (CommonUtil.isNotNullOrEmpty(vo.getJabatanInternal())) { model.setJabatanInternal(jabatanConverter.transferVOToModel(vo.getJabatanInternal(), new Jabatan())); @@ -2553,7 +2579,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(model)) { LoginUser loginUser = loginUserService.getLoginUser(); model = rekamDataPegawaiDao.findOne(model.getId()); - if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { + if (CommonUtil.isNotNullOrEmpty(loginUser) && CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { historyDataPegawai.setPetugas(loginUser.getPegawai()); } @@ -2650,8 +2676,13 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re model.setKedudukan(pegawai.getKedudukan().getName()); } // Golongan Pegawai - if (CommonUtil.isNotNullOrEmpty(pegawai.getGolongan())) { - model.setGolongan(pegawai.getGolongan().getName()); + if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPegawai())) { + model.setGolonganPegawai(pegawai.getGolonganPegawai().getGolonganPegawai()); + } + + // Golongan PPPK + if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPPPK())) { + model.setGolonganPPPK(pegawai.getGolonganPPPK().getNamaGolongan()); } // Jabatan Internal @@ -2843,7 +2874,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(model)) { LoginUser loginUser = loginUserService.getLoginUser(); model = mapPegawaiJabatanToUnitKerjaDao.findOne(model.getId()); - if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { + if (CommonUtil.isNotNullOrEmpty(loginUser) && CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { historyDataPegawai.setPetugas(loginUser.getPegawai()); } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GolonganPPPK.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GolonganPPPK.java index 6ea2e6b0..cf1eb7ad 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GolonganPPPK.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GolonganPPPK.java @@ -8,9 +8,6 @@ import org.hibernate.validator.constraints.NotBlank; import javax.persistence.*; import javax.validation.constraints.Size; -import java.util.UUID; - -import static javax.persistence.GenerationType.AUTO; /** * @author Salman @@ -24,10 +21,10 @@ import static javax.persistence.GenerationType.AUTO; public class GolonganPPPK extends BaseActive { @Id - @GeneratedValue(strategy = AUTO) - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") - @Column(columnDefinition = "uuid") - private UUID id; + @GeneratedValue(generator = "UUID") + @GenericGenerator(name = "UUID", strategy = "uuid") + @Column(columnDefinition = "char(36)", updatable = false, nullable = false) + private String id; @Size(max = 10, message = "Nama golongan maksimal {max} karakter") @NotBlank(message = "Kode golongan tidak boleh kosong") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenjangPPPK.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenjangPPPK.java index 3b401bcd..e228bc06 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenjangPPPK.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenjangPPPK.java @@ -8,9 +8,6 @@ import org.hibernate.validator.constraints.NotBlank; import javax.persistence.*; import javax.validation.constraints.Size; -import java.util.UUID; - -import static javax.persistence.GenerationType.AUTO; /** * @author Salman @@ -24,10 +21,10 @@ import static javax.persistence.GenerationType.AUTO; public class JenjangPPPK extends BaseActive { @Id - @GeneratedValue(strategy = AUTO) - @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") - @Column(columnDefinition = "uuid") - private UUID id; + @GeneratedValue(generator = "UUID") + @GenericGenerator(name = "UUID", strategy = "uuid") + @Column(columnDefinition = "char(36)", updatable = false, nullable = false) + private String id; @Size(max = 100, message = "Jenjang jabatan maksimal {max} karakter") @NotBlank(message = "Jenjang jabatan tidak boleh kosong") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MutasiPegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MutasiPegawai.java index f9833b80..0a52c415 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MutasiPegawai.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MutasiPegawai.java @@ -9,6 +9,8 @@ import javax.persistence.*; import javax.validation.constraints.NotNull; import java.util.Date; +import static javax.persistence.FetchType.LAZY; + /** * class MutasiPegawai * @@ -98,6 +100,14 @@ public class MutasiPegawai extends BaseTransaction { @Column(name = "KodeGolFk", insertable = false, updatable = false) private Integer kodeGolId; + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "objectgolonganpppkfk") + @Caption(value = "Golongan PPPK") + private GolonganPPPK golonganPPPK; + + @Column(name = "objectgolonganpppkfk", insertable = false, updatable = false) + private String golonganPPPKId; + @Column(name = "KodeJabatan", length = 100) @Caption(value = "KodeJabatan") private String kodeJabatan; 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 ea72df4f..34aed3b8 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 @@ -134,6 +134,14 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectGolonganPegawaiFk", insertable = false, updatable = false) private Integer golonganPegawaiId; + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "objectgolonganpppkfk") + @Caption(value = "Golongan PPPK") + private GolonganPPPK golonganPPPK; + + @Column(name = "objectgolonganpppkfk", insertable = false, updatable = false) + private String golonganPPPKId; + @Column(name = "Pensiun") @Caption(value = "Pensiun") private Integer pensiun; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PegawaiSKPajak.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PegawaiSKPajak.java index 3300cc10..943ca525 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PegawaiSKPajak.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PegawaiSKPajak.java @@ -8,6 +8,7 @@ import lombok.Setter; import javax.persistence.*; import javax.validation.constraints.NotNull; +import static javax.persistence.FetchType.LAZY; import static javax.persistence.GenerationType.SEQUENCE; @Getter @@ -25,6 +26,14 @@ public class PegawaiSKPajak extends BaseMaster { @Column(name = "ObjectGolonganPegawaiFk", insertable = false, updatable = false) private Integer golonganPegawaiId; + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "objectgolonganpppkfk") + @Caption(value = "Golongan PPPK") + private GolonganPPPK golonganPPPK; + + @Column(name = "objectgolonganpppkfk", insertable = false, updatable = false) + private String golonganPPPKId; + @ManyToOne @JoinColumn(name = "ObjectRangeFk") @NotNull(message = "Kd Range tidak boleh kosong") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelatihanJpl.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelatihanJpl.java index 590d021a..09d545d3 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelatihanJpl.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelatihanJpl.java @@ -32,6 +32,14 @@ public class PelatihanJpl extends BaseTransaction { @Column(name = "ObjectGolonganFk", insertable = false, updatable = false) private Integer golonganId; + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "objectgolonganpppkfk") + @Caption(value = "Golongan PPPK") + private GolonganPPPK golonganPPPK; + + @Column(name = "objectgolonganpppkfk", insertable = false, updatable = false) + private String golonganPPPKId; + @Caption(value = "jpl") @Column(name = "jpl", length = 150) private String jpl; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GolonganPPPKVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GolonganPPPKVO.java new file mode 100644 index 00000000..65bca929 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GolonganPPPKVO.java @@ -0,0 +1,23 @@ +package com.jasamedika.medifirst2000.vo; + +import com.jasamedika.medifirst2000.base.vo.BaseActiveVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +/** + * @author Salman + * @version 1.0.0 + * @since 2/21/2025 + */ +@Getter +@Setter +public class GolonganPPPKVO extends BaseActiveVO { + + @Caption(value = "ID Golongan PPPK") + private String id; + + @Caption(value = "Nama Golongan") + private String namaGolongan; + +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MutasiPegawaiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MutasiPegawaiVO.java index e53196c2..894dc38c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MutasiPegawaiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MutasiPegawaiVO.java @@ -1,487 +1,144 @@ package com.jasamedika.medifirst2000.vo; -import java.util.Date; - -import javax.persistence.Column; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; +import java.util.Date; /** - * class MutasiPegawaiVOVO + * class MutasiPegawaiVOVO * * @author Generator */ -public class MutasiPegawaiVO extends BaseTransactionVO{ - +@Getter +@Setter +public class MutasiPegawaiVO extends BaseTransactionVO { + @Caption(value = "NomorAgenda") private String nomorAgenda; - + @NotNull(message = "Nama Pegawai Harus Diisi") @Caption(value = "Pegawai") private Pegawai pegawai; - - @Column(name = "ObjectPegawaiFk", insertable=false, updatable=false) + private Integer pegawaiId; @NotNull(message = "Jenis SK Harus Diisi") @Caption(value = "JenisSk") private JenisSkVO jenisSK; - - @Column(name = "JenisSkFk", insertable=false, updatable=false) + private Integer jenisSkId; - @Column(name = "TanggalSK", nullable = true , length = 100) @Caption(value = "TanggalSK") private Date tanggalSK; - @Column(name = "Nomor", nullable = true , length = 100) @Caption(value = "Nomor") private String nomor; - @Column(name = "Uraian", nullable = true , length = 100) @Caption(value = "Uraian") private String uraian; @NotNull(message = "SK Dari Harus Diisi") @Caption(value = "SkDari") private PegawaiVO skDari; - - @Column(name = "SkDariFk", insertable=false, updatable=false) + private Integer skDariId; @NotNull(message = "Status Pegawai Harus Diisi") @Caption(value = "SkDari") private KategoryPegawaiVO statusPegawai; - - @Column(name = "StatusPegawaiFk", insertable=false,updatable=false) + private Integer statusPegawaiId; @NotNull(message = "Kedudukan Harus Diisi") @Caption(value = "Kedudukan") private KedudukanVO kedudukan; - - @Column(name = "KedudukanFk", insertable=false,updatable=false) + private Integer kedudukanId; - @Column(name = "TanggalMeninggal", nullable = true , length = 100) @Caption(value = "TanggalMeninggal") private Date tanggalMeninggal; - @Column(name = "KodeGapok", nullable = true , length = 100) @Caption(value = "KodeGapok") private String kodeGapok; @NotNull(message = "Kode Golongan Harus Diisi") @Caption(value = "KodeGol") private GolonganPegawaiVO kodeGol; - - @Column(name = "KodeGolFk", insertable=false,updatable=false) + private Integer kodeGolId; - @Column(name = "KodeJabatan", nullable = true , length = 100) + private GolonganPPPKVO golonganPPPK; + + private String golonganPPPKId; + @Caption(value = "KodeJabatan") private String kodeJabatan; - -// @NotNull(message = "Jabatan Internal Harus Diisi") + @Caption(value = "jabatanInternal") private MapPegawaiJabatanToUnitKerjaVO jabatanInternal; - - @Column(name = "JabatanInternalFk", insertable=false,updatable=false) + private Integer jabatanInternalId; - + @NotNull(message = "Jabatan Fungsional Harus Diisi") @Caption(value = "jabatanFungsional") private JabatanVO jabatanFungsional; - - @Column(name = "JabatanFungsionalFk", insertable=false,updatable=false) + private Integer jabatanFungsionalId; - @Column(name = "Pensiun", nullable = true , length = 100) @Caption(value = "Pensiun") private Integer pensiun; - @Column(name = "TunjanganFungsional", nullable = true , length = 100) @Caption(value = "TunjanganFungsional") private String tunjanganFungsional; - @Column(name = "TunjanganUmum", nullable = true , length = 100) @Caption(value = "TunjanganUmum") private String tunjanganUmum; - @Column(name = "TunjanganPapua", nullable = true , length = 100) @Caption(value = "TunjanganPapua") private String tunjanganPapua; - @Column(name = "WilayahTerperinci", nullable = true , length = 100) @Caption(value = "WilayahTerperinci") private String wilayahTerperinci; @NotNull(message = "Status Kawin Harus Diisi") @Caption(value = "StatusKawin") private StatusPerkawinanPegawaiVO statusKawin; - - @Column(name = "StatusKawinFk", insertable=false,updatable=false) + private Integer statusKawinId; - + @NotNull(message = "Eselon Harus Diisi") @Caption(value = "Eselon") private EselonVO eselon; - - @Column(name = "EselonFk", insertable=false,updatable=false) + private Integer eselonId; - + @NotNull(message = "Jenis Hukuman Harus Diisi") @Caption(value = "JenisHukuman") private JenisHukumanVO jenisHukuman; - - @Column(name = "JenisHukumanFk", insertable=false,updatable=false) + private Integer jenisHukumanId; - @Column(name = "Beras", nullable = true , length = 100) @Caption(value = "Beras") private String beras; - @Column(name = "Jumlah", nullable = true , length = 100) @Caption(value = "Jumlah") private Integer jumlah; - @Column(name = "Grade", nullable = true , length = 100) @Caption(value = "Grade") private Integer grade; - @Column(name = "TanggalTMT", nullable = true , length = 100) @Caption(value = "TanggalTMT") private Date tanggalTMT; - @Column(name = "TanggalRekam", nullable = false , length = 100) @Caption(value = "TanggalRekam") private Date tanggalRekam; - @Column(name = "Defauld", nullable = true , length = 100) @Caption(value = "Defauld") private Integer defauld; - public String getNomorAgenda() { - return nomorAgenda; - } - - public void setNomorAgenda(String nomorAgenda) { - this.nomorAgenda = nomorAgenda; - } - - public Pegawai getPegawai() { - return pegawai; - } - - public void setPegawai(Pegawai pegawai) { - this.pegawai = pegawai; - } - - public Integer getPegawaiId() { - return pegawaiId; - } - - public void setPegawaiId(Integer pegawaiId) { - this.pegawaiId = pegawaiId; - } - - public JenisSkVO getJenisSK() { - return jenisSK; - } - - public void setJenisSK(JenisSkVO jenisSK) { - this.jenisSK = jenisSK; - } - - public Integer getJenisSkId() { - return jenisSkId; - } - - public void setJenisSkId(Integer jenisSkId) { - this.jenisSkId = jenisSkId; - } - - public Date getTanggalSK() { - return tanggalSK; - } - - public void setTanggalSK(Date tanggalSK) { - this.tanggalSK = tanggalSK; - } - - public String getNomor() { - return nomor; - } - - public void setNomor(String nomor) { - this.nomor = nomor; - } - - public String getUraian() { - return uraian; - } - - public void setUraian(String uraian) { - this.uraian = uraian; - } - - public PegawaiVO getSkDari() { - return skDari; - } - - public void setSkDari(PegawaiVO skDari) { - this.skDari = skDari; - } - - public Integer getSkDariId() { - return skDariId; - } - - public void setSkDariId(Integer skDariId) { - this.skDariId = skDariId; - } - - public KategoryPegawaiVO getStatusPegawai() { - return statusPegawai; - } - - public void setStatusPegawai(KategoryPegawaiVO statusPegawai) { - this.statusPegawai = statusPegawai; - } - - public Integer getStatusPegawaiId() { - return statusPegawaiId; - } - - public void setStatusPegawaiId(Integer statusPegawaiId) { - this.statusPegawaiId = statusPegawaiId; - } - - 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 getKodeGapok() { - return kodeGapok; - } - - public void setKodeGapok(String kodeGapok) { - this.kodeGapok = kodeGapok; - } - - public GolonganPegawaiVO getKodeGol() { - return kodeGol; - } - - public void setKodeGol(GolonganPegawaiVO kodeGol) { - this.kodeGol = kodeGol; - } - - public Integer getKodeGolId() { - return kodeGolId; - } - - public void setKodeGolId(Integer kodeGolId) { - this.kodeGolId = kodeGolId; - } - - public String getKodeJabatan() { - return kodeJabatan; - } - - public void setKodeJabatan(String kodeJabatan) { - this.kodeJabatan = kodeJabatan; - } - - public MapPegawaiJabatanToUnitKerjaVO getJabatanInternal() { - return jabatanInternal; - } - - public void setJabatanInternal(MapPegawaiJabatanToUnitKerjaVO jabatanInternal) { - this.jabatanInternal = jabatanInternal; - } - - public Integer getJabatanInternalId() { - return jabatanInternalId; - } - - public void setJabatanInternalId(Integer jabatanInternalId) { - this.jabatanInternalId = jabatanInternalId; - } - - 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 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 String getTunjanganUmum() { - return tunjanganUmum; - } - - public void setTunjanganUmum(String tunjanganUmum) { - this.tunjanganUmum = tunjanganUmum; - } - - public String getTunjanganPapua() { - return tunjanganPapua; - } - - public void setTunjanganPapua(String tunjanganPapua) { - this.tunjanganPapua = tunjanganPapua; - } - - public String getWilayahTerperinci() { - return wilayahTerperinci; - } - - public void setWilayahTerperinci(String wilayahTerperinci) { - this.wilayahTerperinci = wilayahTerperinci; - } - - public StatusPerkawinanPegawaiVO getStatusKawin() { - return statusKawin; - } - - public void setStatusKawin(StatusPerkawinanPegawaiVO statusKawin) { - this.statusKawin = statusKawin; - } - - public Integer getStatusKawinId() { - return statusKawinId; - } - - public void setStatusKawinId(Integer statusKawinId) { - this.statusKawinId = statusKawinId; - } - - 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 JenisHukumanVO getJenisHukuman() { - return jenisHukuman; - } - - public void setJenisHukuman(JenisHukumanVO jenisHukuman) { - this.jenisHukuman = jenisHukuman; - } - - public Integer getJenisHukumanId() { - return jenisHukumanId; - } - - public void setJenisHukumanId(Integer jenisHukumanId) { - this.jenisHukumanId = jenisHukumanId; - } - - public String getBeras() { - return beras; - } - - public void setBeras(String beras) { - this.beras = beras; - } - - public Integer getJumlah() { - return jumlah; - } - - public void setJumlah(Integer jumlah) { - this.jumlah = jumlah; - } - - public Integer getGrade() { - return grade; - } - - public void setGrade(Integer grade) { - this.grade = grade; - } - - public Date getTanggalTMT() { - return tanggalTMT; - } - - public void setTanggalTMT(Date tanggalTMT) { - this.tanggalTMT = tanggalTMT; - } - - public Date getTanggalRekam() { - return tanggalRekam; - } - - public void setTanggalRekam(Date tanggalRekam) { - this.tanggalRekam = tanggalRekam; - } - - public Integer getDefauld() { - return defauld; - } - - public void setDefauld(Integer defauld) { - this.defauld = defauld; - } - } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanJplVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanJplVO.java index 8d65c0ec..7ba43775 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanJplVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelatihanJplVO.java @@ -1,37 +1,18 @@ package com.jasamedika.medifirst2000.vo; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter public class PelatihanJplVO { private EselonVO eselon; - // private GolonganVO golongan; + private GolonganPegawaiVO golonganPegawai; - private GolonganPegawaiVO golongan; + private GolonganPPPKVO golonganPPPK; private String jpl; - public EselonVO getEselon() { - return eselon; - } - - public void setEselon(EselonVO eselon) { - this.eselon = eselon; - } - - public GolonganPegawaiVO getGolongan() { - return golongan; - } - - public void setGolongan(GolonganPegawaiVO golongan) { - this.golongan = golongan; - } - - public String getJpl() { - return jpl; - } - - public void setJpl(String jpl) { - this.jpl = jpl; - } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiCustomVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiCustomVO.java index ee998b13..e34544ef 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiCustomVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiCustomVO.java @@ -1,14 +1,18 @@ package com.jasamedika.medifirst2000.vo; -import java.util.Date; - import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; /** * class RekamDataPegawaiVO * * @author Lukman Hakim */ +@Getter +@Setter public class RekamDataPegawaiCustomVO extends BaseTransactionVO{ private String nip; private String nama; @@ -20,7 +24,10 @@ public class RekamDataPegawaiCustomVO extends BaseTransactionVO{ private String kodeGapokId; private String Golongan; private Integer GolonganId; + private String golonganPegawai; private Integer golonganPegawaiId; + private String golonganPPPK; + private String golonganPPPKId; private Integer pensiun; private String tunjanganFungsional; private Integer tunjanganPapua; @@ -141,971 +148,4 @@ public class RekamDataPegawaiCustomVO extends BaseTransactionVO{ private Double nilaiJabatan; - 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 String getKedudukan() { - return kedudukan; - } - - public void setKedudukan(String kedudukan) { - this.kedudukan = kedudukan; - } - - public String getDetailKelompokJabatan() { - return detailKelompokJabatan; - } - - public void setDetailKelompokJabatan(String detailKelompokJabatan) { - this.detailKelompokJabatan = detailKelompokJabatan; - } - - 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 String getGolongan() { - return Golongan; - } - - public void setGolongan(String golongan) { - Golongan = golongan; - } - - public Integer getGolonganId() { - return GolonganId; - } - - public void setGolonganId(Integer golonganId) { - GolonganId = golonganId; - } - - 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 String getStatusKawin() { - return statusKawin; - } - - public void setStatusKawin(String 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 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 String getAgama() { - return agama; - } - - public void setAgama(String agama) { - this.agama = agama; - } - - public Integer getAgamaId() { - return agamaId; - } - - public void setAgamaId(Integer agamaId) { - this.agamaId = agamaId; - } - - public String getDetailKategoryPegawai() { - return detailKategoryPegawai; - } - - public void setDetailKategoryPegawai(String detailKategoryPegawai) { - this.detailKategoryPegawai = detailKategoryPegawai; - } - - public Integer getDetailKategoryPegawaiId() { - return detailKategoryPegawaiId; - } - - public void setDetailKategoryPegawaiId(Integer detailKategoryPegawaiId) { - this.detailKategoryPegawaiId = detailKategoryPegawaiId; - } - - public String getDokumen() { - return dokumen; - } - - public void setDokumen(String dokumen) { - this.dokumen = dokumen; - } - - public Integer getDokumenId() { - return dokumenId; - } - - public void setDokumenId(Integer dokumenId) { - this.dokumenId = dokumenId; - } - - public String getEselon() { - return eselon; - } - - public void setEselon(String eselon) { - this.eselon = eselon; - } - - public Integer getEselonId() { - return eselonId; - } - - public void setEselonId(Integer eselonId) { - this.eselonId = eselonId; - } - - public String getGolonganDarah() { - return golonganDarah; - } - - public void setGolonganDarah(String golonganDarah) { - this.golonganDarah = golonganDarah; - } - - public String getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(String unitKerja) { - this.unitKerja = unitKerja; - } - - public Integer getGolonganDarahId() { - return golonganDarahId; - } - - public void setGolonganDarahId(Integer golonganDarahId) { - this.golonganDarahId = golonganDarahId; - } - - public String getJabatanFungsional() { - return jabatanFungsional; - } - - public void setJabatanFungsional(String jabatanFungsional) { - this.jabatanFungsional = jabatanFungsional; - } - - public Integer getJabatanFungsionalId() { - return jabatanFungsionalId; - } - - public void setJabatanFungsionalId(Integer jabatanFungsionalId) { - this.jabatanFungsionalId = jabatanFungsionalId; - } - - public String getJabatanInternal() { - return jabatanInternal; - } - - public void setJabatanInternal(String jabatanInternal) { - this.jabatanInternal = jabatanInternal; - } - - public Integer getJabatanInternalId() { - return jabatanInternalId; - } - - public void setJabatanInternalId(Integer jabatanInternalId) { - this.jabatanInternalId = jabatanInternalId; - } - - public String getJabatanLamar() { - return jabatanLamar; - } - - public void setJabatanLamar(String jabatanLamar) { - this.jabatanLamar = jabatanLamar; - } - - public Integer getJabatanLamarId() { - return jabatanLamarId; - } - - public void setJabatanLamarId(Integer jabatanLamarId) { - this.jabatanLamarId = jabatanLamarId; - } - - public String getJabatanStruktural() { - return jabatanStruktural; - } - - public void setJabatanStruktural(String jabatanStruktural) { - this.jabatanStruktural = jabatanStruktural; - } - - public Integer getJabatanStrukturalId() { - return jabatanStrukturalId; - } - - public void setJabatanStrukturalId(Integer jabatanStrukturalId) { - this.jabatanStrukturalId = jabatanStrukturalId; - } - - public String getJenisKelamin() { - return jenisKelamin; - } - - public void setJenisKelamin(String jenisKelamin) { - this.jenisKelamin = jenisKelamin; - } - - public Integer getJenisKelaminId() { - return jenisKelaminId; - } - - public void setJenisKelaminId(Integer jenisKelaminId) { - this.jenisKelaminId = jenisKelaminId; - } - - public String getJenisPegawai() { - return jenisPegawai; - } - - public void setJenisPegawai(String jenisPegawai) { - this.jenisPegawai = jenisPegawai; - } - - public Integer getJenisPegawaiId() { - return jenisPegawaiId; - } - - public void setJenisPegawaiId(Integer jenisPegawaiId) { - this.jenisPegawaiId = jenisPegawaiId; - } - - public String getJenisPegawaiLamar() { - return jenisPegawaiLamar; - } - - public void setJenisPegawaiLamar(String jenisPegawaiLamar) { - this.jenisPegawaiLamar = jenisPegawaiLamar; - } - - public Integer getJenisPegawaiLamarId() { - return jenisPegawaiLamarId; - } - - public void setJenisPegawaiLamarId(Integer jenisPegawaiLamarId) { - this.jenisPegawaiLamarId = jenisPegawaiLamarId; - } - - public String getKualifikasiJurusan() { - return kualifikasiJurusan; - } - - public void setKualifikasiJurusan(String kualifikasiJurusan) { - this.kualifikasiJurusan = kualifikasiJurusan; - } - - public Integer getKualifikasiJurusanId() { - return kualifikasiJurusanId; - } - - public void setKualifikasiJurusanId(Integer kualifikasiJurusanId) { - this.kualifikasiJurusanId = kualifikasiJurusanId; - } - - public String getNegara() { - return negara; - } - - public void setNegara(String negara) { - this.negara = negara; - } - - public Integer getNegaraId() { - return negaraId; - } - - public void setNegaraId(Integer negaraId) { - this.negaraId = negaraId; - } - - public String getPangkat() { - return pangkat; - } - - public void setPangkat(String pangkat) { - this.pangkat = pangkat; - } - - public Integer getPangkatId() { - return pangkatId; - } - - public void setPangkatId(Integer pangkatId) { - this.pangkatId = pangkatId; - } - - public String getPendidikan() { - return pendidikan; - } - - public void setPendidikan(String pendidikan) { - this.pendidikan = pendidikan; - } - - public Integer getPendidikanId() { - return pendidikanId; - } - - public void setPendidikanId(Integer pendidikanId) { - this.pendidikanId = pendidikanId; - } - - public String getPenghasilanTidakKenaPajak() { - return penghasilanTidakKenaPajak; - } - - public void setPenghasilanTidakKenaPajak(String penghasilanTidakKenaPajak) { - this.penghasilanTidakKenaPajak = penghasilanTidakKenaPajak; - } - - public Integer getPenghasilanTidakKenaPajakId() { - return penghasilanTidakKenaPajakId; - } - - public void setPenghasilanTidakKenaPajakId(Integer penghasilanTidakKenaPajakId) { - this.penghasilanTidakKenaPajakId = penghasilanTidakKenaPajakId; - } - - 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 getRange() { - return range; - } - - public void setRange(String range) { - this.range = range; - } - - public Integer getRangeId() { - return rangeId; - } - - public void setRangeId(Integer rangeId) { - this.rangeId = rangeId; - } - - public String getRuangan() { - return ruangan; - } - - public void setRuangan(String ruangan) { - this.ruangan = ruangan; - } - - public Integer getRuanganId() { - return ruanganId; - } - - public void setRuanganId(Integer ruanganId) { - this.ruanganId = ruanganId; - } - - public String getShiftKerja() { - return shiftKerja; - } - - public void setShiftKerja(String shiftKerja) { - this.shiftKerja = shiftKerja; - } - - public Integer getShiftKerjaId() { - return shiftKerjaId; - } - - public void setShiftKerjaId(Integer shiftKerjaId) { - this.shiftKerjaId = shiftKerjaId; - } - - public String getKategoryPegawai() { - return kategoryPegawai; - } - - public void setKategoryPegawai(String kategoryPegawai) { - this.kategoryPegawai = kategoryPegawai; - } - - public Integer getKategoryPegawaiId() { - return kategoryPegawaiId; - } - - public void setKategoryPegawaiId(Integer kategoryPegawaiId) { - this.kategoryPegawaiId = kategoryPegawaiId; - } - - public String getStatusPegawai() { - return statusPegawai; - } - - public void setStatusPegawai(String statusPegawai) { - this.statusPegawai = statusPegawai; - } - - public Integer getStatusPegawaiId() { - return statusPegawaiId; - } - - public void setStatusPegawaiId(Integer statusPegawaiId) { - this.statusPegawaiId = statusPegawaiId; - } - - public String getStatusPerkawinanPegawai() { - return statusPerkawinanPegawai; - } - - public void setStatusPerkawinanPegawai(String statusPerkawinanPegawai) { - this.statusPerkawinanPegawai = statusPerkawinanPegawai; - } - - public Integer getStatusPerkawinanPegawaiId() { - return statusPerkawinanPegawaiId; - } - - public void setStatusPerkawinanPegawaiId(Integer statusPerkawinanPegawaiId) { - this.statusPerkawinanPegawaiId = statusPerkawinanPegawaiId; - } - - public String getSuku() { - return suku; - } - - public void setSuku(String suku) { - this.suku = suku; - } - - public Integer getSukuId() { - return sukuId; - } - - public void setSukuId(Integer sukuId) { - this.sukuId = sukuId; - } - - public String getTitlePasien() { - return titlePasien; - } - - public void setTitlePasien(String titlePasien) { - this.titlePasien = titlePasien; - } - - public Integer getTitlePasienId() { - return titlePasienId; - } - - public void setTitlePasienId(Integer titlePasienId) { - this.titlePasienId = titlePasienId; - } - - public String getTypePegawai() { - return typePegawai; - } - - public void setTypePegawai(String 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 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 Date getTglMasuk() { - return tglMasuk; - } - - public void setTglMasuk(Date tglMasuk) { - this.tglMasuk = tglMasuk; - } - - public Date getTglRetired() { - return tglRetired; - } - - public void setTglRetired(Date tglRetired) { - this.tglRetired = tglRetired; - } - - public Date getTglLahir() { - return tglLahir; - } - - public void setTglLahir(Date tglLahir) { - this.tglLahir = tglLahir; - } - - public Date getTglPensiun() { - return tglPensiun; - } - - public void setTglPensiun(Date tglPensiun) { - this.tglPensiun = tglPensiun; - } - - public String getNoBPJS() { - return noBPJS; - } - - public void setNoBPJS(String noBPJS) { - this.noBPJS = noBPJS; - } - - public String getSatuanKerja() { - return satuanKerja; - } - - public void setSatuanKerja(String satuanKerja) { - this.satuanKerja = satuanKerja; - } - - public Integer getSatuanKerjaId() { - return satuanKerjaId; - } - - public void setSatuanKerjaId(Integer satuanKerjaId) { - this.satuanKerjaId = satuanKerjaId; - } - - public String getRekanan() { - return rekanan; - } - - public void setRekanan(String rekanan) { - this.rekanan = rekanan; - } - - public Integer getRekananId() { - return rekananId; - } - - public void setRekananId(Integer rekananId) { - this.rekananId = rekananId; - } - - public String getPeriodePengajar() { - return periodePengajar; - } - - public void setPeriodePengajar(String periodePengajar) { - this.periodePengajar = periodePengajar; - } - - public String getPeriodePengajarId() { - return periodePengajarId; - } - - public void setPeriodePengajarId(String periodePengajarId) { - this.periodePengajarId = periodePengajarId; - } - - 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; - } } \ No newline at end of file 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 783b2aa5..2ec0cbf7 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 @@ -17,6 +17,7 @@ import java.util.List; @Getter @Setter public class RekamDataPegawaiVO extends BaseTransactionVO { + private Integer id; private String nip; @@ -45,6 +46,10 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { private Integer golonganPegawaiId; + private GolonganPPPKVO golonganPPPK; + + private String golonganPPPKId; + private Integer pensiun; private String tunjanganFungsional; @@ -280,4 +285,5 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { private List mappingJabatan; private String nim; + } diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml index 461b2914..ed7db8c5 100644 --- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml +++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml @@ -415,6 +415,7 @@ + @@ -652,6 +653,8 @@ + + @@ -1583,8 +1586,7 @@ - + diff --git a/jasamedika-web/src/main/resources/hibernate.cfg.xml b/jasamedika-web/src/main/resources/hibernate.cfg.xml index 2a5abdc8..04f43c08 100644 --- a/jasamedika-web/src/main/resources/hibernate.cfg.xml +++ b/jasamedika-web/src/main/resources/hibernate.cfg.xml @@ -414,6 +414,7 @@ + @@ -651,6 +652,8 @@ + + @@ -1582,8 +1585,7 @@ - +