From cd65e12b2292545414202544ab9c3da953c8e75b Mon Sep 17 00:00:00 2001 From: salmanoe Date: Tue, 12 Jan 2021 21:01:38 +0700 Subject: [PATCH] penerapan entri otomatis subunit kerja saat tambah unit kerja --- .../impl/UnitKerjaPegawaiServiceImpl.java | 9 +- .../vo/RekamDataPegawaiCustomVO.java | 3 - .../medifirst2000/vo/RekamDataPegawaiVO.java | 185 +++++++++++++----- .../medifirst2000/vo/UnitKerjaPegawaiVO.java | 14 +- .../medifirst2000/vo/UnitKerjaVO.java | 28 +-- 5 files changed, 158 insertions(+), 81 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UnitKerjaPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UnitKerjaPegawaiServiceImpl.java index 1f3f44d6..4eae176d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UnitKerjaPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UnitKerjaPegawaiServiceImpl.java @@ -38,13 +38,20 @@ public class UnitKerjaPegawaiServiceImpl implements UnitKerjaPegawaiService { @Transactional(readOnly = false) public Map saveUnitkerja(UnitKerjaPegawaiVO vo) { Map result = new HashMap(); + if (CommonUtil.isNotNullOrEmpty(vo)) { UnitKerjaPegawai temp = unitKerjaConverter.transferVOToModel(vo, new UnitKerjaPegawai()); UnitKerjaPegawai model = unitKerjaDao.save(temp); if (CommonUtil.isNotNullOrEmpty(model)) { + SubUnitKerjaPegawai suk = subUnitKerjaConverter.transferVOToModel(vo.getSubUnitKerja(), + new SubUnitKerjaPegawai()); + suk.setUnitKerja(model); + subUnitKerjaDao.save(suk); + result.put("id", model.getId()); } } + return result; } @@ -131,7 +138,7 @@ public class UnitKerjaPegawaiServiceImpl implements UnitKerjaPegawaiService { } return result; } - + @Override @Transactional(readOnly = true) public List> getAllSubunitKerjaByUnitKerja(Integer idUnitKerjaPegawai) { 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 e342f069..ee998b13 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 @@ -2,10 +2,7 @@ package com.jasamedika.medifirst2000.vo; import java.util.Date; -import javax.persistence.Column; - import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; -import com.jasamedika.medifirst2000.entities.KelompokJabatan; /** * class RekamDataPegawaiVO 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 14a2f504..74984c68 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 @@ -8,142 +8,265 @@ import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; * class RekamDataPegawaiVO * * @author Lukman Hakim + * */ public class RekamDataPegawaiVO extends BaseTransactionVO { + private Integer id; + private String nip; + private String nama; + private KedudukanVO kedudukan; + private NilaiKelompokJabatanVO detailKelompokJabatan; + private PegawaiVO pegawaiPembimbing; + private Integer pegawaiPembimbingId; + private Integer kedudukanId; + private Date tanggalMeninggal; + private String idFinger; + private String kodeGapokId; - // private GolonganVO golongan; + private Integer GolonganId; + private GolonganPegawaiVO golonganPegawai; + private Integer golonganPegawaiId; + private Integer pensiun; + private String tunjanganFungsional; + private Integer tunjanganPapua; + private Integer wilayahTerperinci; + private Integer tunjanganUmum; + private StatusPerkawinanVO statusKawin; + private Integer statusKawinId; + private String beras; + private String sewaRumah; + private String alamat; + private String kodePos; + private String bankRekeningAtasNama; + private String kodeBank; + private String bankRekeningNama; + private String bankRekeningNomor; + private AgamaVO agama; + private Integer agamaId; + private DetailKategoryPegawaiVO detailKategoryPegawai; + private Integer detailKategoryPegawaiId; + private DokumenVO dokumen; + private Integer dokumenId; + private EselonVO eselon; + private Integer eselonId; + private GolonganDarahVO golonganDarah; + private SubUnitKerjaPegawaiVO unitKerja; + private Integer golonganDarahId; + private JabatanVO jabatanFungsional; + private Integer jabatanFungsionalId; + private JabatanVO jabatanInternal; + private Integer jabatanInternalId; + private JabatanVO jabatanLamar; + private Integer jabatanLamarId; + private JabatanVO jabatanStruktural; - // private Set mapPegawaiJabatanToUnitKerja - // = new HashSet(); + private Integer jabatanStrukturalId; + private JenisKelaminVO jenisKelamin; + private Integer jenisKelaminId; + private JenisPegawaiVO jenisPegawai; + private Integer jenisPegawaiId; + private JenisPegawaiVO jenisPegawaiLamar; + private Integer jenisPegawaiLamarId; + private KualifikasiJurusanVO kualifikasiJurusan; + private Integer kualifikasiJurusanId; + private NegaraVO negara; + private Integer negaraId; + private PangkatVO pangkat; + private Integer pangkatId; + private PendidikanVO pendidikan; + private Integer pendidikanId; + private PenghasilanTidakKenaPajakVO penghasilanTidakKenaPajak; + private Integer penghasilanTidakKenaPajakId; + private String gelarDepan; + private String gelarBelakang; + private RangeVO range; + private Integer rangeId; + private RuanganVO ruangan; + private Integer ruanganId; + private KelompokShiftVO shiftKerja; + private Integer shiftKerjaId; + private KategoryPegawaiVO kategoryPegawai; + private Integer kategoryPegawaiId; + private StatusPegawaiVO statusPegawai; + private Integer statusPegawaiId; + private StatusPerkawinanPegawaiVO statusPerkawinanPegawai; + private Integer statusPerkawinanPegawaiId; + private SukuVO suku; + private Integer sukuId; + private TitlePasienVO titlePasien; + private Integer titlePasienId; + private TypePegawaiVO typePegawai; + private Integer typePegawaiId; + private String namaKeluarga; + private String namaLengkap; + private String namaPanggilan; + private String nikIntern; + private String nipPns; + private String noIdentitas; + private String noCm; + private Integer noStruk_TTujuanLastId; + private String npwp; + private String photoDiri; + private short qPegawai; + private Byte qtyAnak; + private Byte qtyTanggungan; + private Byte qtyTotalJiwa; + private String statusRhesus; + private String tempatLahir; + private Double totalNilaiScore; + private String email; + private String emailAlternatif; + private String noTlp; + private String noHandphone; + private Date tglkeluar; + private String noSip; + private Date tglTerbitSip; + private Date tglBerakhirSip; + private String noStr; + private Date tglTerbitStr; + private Date tglBerakhirStr; + private Date tglMasuk; + private Date tglRetired; + private Date tglLahir; + private Date tglPensiun; + private String noBPJS; + private SatuanKerjaVO satuanKerja; + private Integer satuanKerjaId; + private RekananVO rekanan; + private Integer rekananId; + private PeriodePengajarVO periodePengajar; + private String periodePengajarId; + private Double grade; + private Double nilaiJabatan; + private LevelTingkatVO levelTingkat; + private Boolean isMenanggung; - // private PegawaiVO atasanLangsung; - // private Integer atasanLangsungId; - // private PegawaiVO pejabatPenilai; - // private Integer pejabatPenilaiId; + + private MapPegawaiJabatanToUnitKerjaVO mappingJabatan; public Double getGrade() { return grade; @@ -513,16 +636,6 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { this.jabatanStrukturalId = jabatanStrukturalId; } - // public Set - // getMapPegawaiJabatanToUnitKerja() { - // return mapPegawaiJabatanToUnitKerja; - // } - // public void - // setMapPegawaiJabatanToUnitKerja(Set - // mapPegawaiJabatanToUnitKerja) { - // this.mapPegawaiJabatanToUnitKerja = mapPegawaiJabatanToUnitKerja; - // } - public JenisKelaminVO getJenisKelamin() { return jenisKelamin; } @@ -915,11 +1028,6 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { this.statusRhesus = statusRhesus; } - /* - * public GolonganVO getGolongan() { return golongan; } public void - * setGolongan(GolonganVO golongan) { this.golongan = golongan; } - */ - public String getTempatLahir() { return tempatLahir; } @@ -1152,31 +1260,6 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { this.levelTingkat = levelTingkat; } - // public PegawaiVO getAtasanLangsung() { - // return atasanLangsung; - // } - // public void setAtasanLangsung(PegawaiVO atasanLangsung) { - // this.atasanLangsung = atasanLangsung; - // } - // public Integer getAtasanLangsungId() { - // return atasanLangsungId; - // } - // public void setAtasanLangsungId(Integer atasanLangsungId) { - // this.atasanLangsungId = atasanLangsungId; - // } - // public PegawaiVO getPejabatPenilai() { - // return pejabatPenilai; - // } - // public void setPejabatPenilai(PegawaiVO pejabatPenilai) { - // this.pejabatPenilai = pejabatPenilai; - // } - // public Integer getPejabatPenilaiId() { - // return pejabatPenilaiId; - // } - // public void setPejabatPenilaiId(Integer pejabatPenilaiId) { - // this.pejabatPenilaiId = pejabatPenilaiId; - // } - public Boolean getIsMenanggung() { return isMenanggung; } @@ -1201,4 +1284,12 @@ public class RekamDataPegawaiVO extends BaseTransactionVO { this.pegawaiPembimbingId = pegawaiPembimbingId; } + public MapPegawaiJabatanToUnitKerjaVO getMappingJabatan() { + return mappingJabatan; + } + + public void setMappingJabatan(MapPegawaiJabatanToUnitKerjaVO mappingJabatan) { + this.mappingJabatan = mappingJabatan; + } + } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaPegawaiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaPegawaiVO.java index 5d150a7b..5aeb147f 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaPegawaiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaPegawaiVO.java @@ -1,10 +1,18 @@ package com.jasamedika.medifirst2000.vo; -import com.jasamedika.medifirst2000.entities.BaseKeyValueMaster; +import com.jasamedika.medifirst2000.helper.Caption; public class UnitKerjaPegawaiVO extends BaseKeyValueMasterVO{ - - + @Caption("Subunit Kerja") + private SubUnitKerjaPegawaiVO subUnitKerja; + public SubUnitKerjaPegawaiVO getSubUnitKerja() { + return subUnitKerja; + } + + public void setSubUnitKerja(SubUnitKerjaPegawaiVO subUnitKerja) { + this.subUnitKerja = subUnitKerja; + } + } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaVO.java index 3bd759ce..08a75bb9 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/UnitKerjaVO.java @@ -1,19 +1,7 @@ package com.jasamedika.medifirst2000.vo; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; +import javax.persistence.Column; -import javax.persistence.*; -import java.util.Date; -import org.hibernate.validator.constraints.NotEmpty; - -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; -import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.internal.util.logging.Messages; - -import com.fasterxml.jackson.annotation.JsonManagedReference; import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; import com.jasamedika.medifirst2000.helper.Caption; @@ -22,8 +10,6 @@ import com.jasamedika.medifirst2000.helper.Caption; * * @author Generator */ -//@Entity -//@Table(name = "UnitKerja_M") public class UnitKerjaVO extends BaseMasterVO { @Caption(value = "Kode Pimpinan") private String kdPimpinan; @@ -85,16 +71,4 @@ public class UnitKerjaVO extends BaseMasterVO { this.namaUnitKerja = namaUnitKerja; } - /*// - @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "kdunitkerja") - private Set JenisSatuanKerjaSet = new HashSet(); - - public Set getJenisSatuanKerjaSet() { - return JenisSatuanKerjaSet; - } - - public void setJenisSatuanKerjaSet(Set jenisSatuanKerjaSet) { - JenisSatuanKerjaSet = jenisSatuanKerjaSet; - }*/ - }