From 49fe2a0bfd929bf2dd54d09505f7f5a3e1bf57b5 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 17 May 2021 16:48:08 +0700 Subject: [PATCH] - perbaikan service rekapitulasi evaluasi jabatan terhadap konsep sotk master jabatan - perbaikan hak akses sdm berdasarkan level jabatan dan subbag menu terkait - penambahan isian jenis sumber data di riwayat jabatan dan data jabatan pegawai --- .../medifirst2000/dao/EvaluasiJabatanDao.java | 8 ++-- .../medifirst2000/dao/PegawaiDao.java | 10 ++--- .../MapPegawaiJabatanToUnitKerja.java | 12 ++++++ .../entities/RiwayatJabatan.java | 42 ++++++++++++------- .../vo/MapPegawaiJabatanToUnitKerjaVO.java | 11 +++++ .../medifirst2000/vo/RiwayatJabatanVO.java | 35 ++++++++++------ 6 files changed, 82 insertions(+), 36 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java index 981f2623..683bc21b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java @@ -42,8 +42,8 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository> findDistinctEvaluasiJabatan(); @@ -56,7 +56,7 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository> findAllEvaluasiJabatan(); 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 1a58a2e6..ea76cb0b 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 @@ -845,11 +845,11 @@ public interface PegawaiDao extends PagingAndSortingRepository + "inner join mapPegawai.jabatan jabatan " + "where mapPegawai.jabatan.namaJabatan like %:namaJabatan%") public Map getKepalaPegawai(@Param("namaJabatan") String namaJabatan); - @Query("select pegawai.id " + "from MapPegawaiJabatanToUnitKerja mapPegawai " - + "inner join mapPegawai.pegawai pegawai " + "where mapPegawai.isPrimary is true " - + "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true " - + "and mapPegawai.subUnitKerjaPegawaiId = :idSubUnitKerja " - + "and mapPegawai.unitKerjaPegawaiId = :idUnitKerja") + @Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + + "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId " + + "and mj.statusEnabled is true and pg.statusEnabled is true and jb.statusEnabled is true " + + "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4) " + + "or (mj.subUnitKerjaPegawaiId = :idSubUnitKerja and jb.levelJabatan = 5))") public List getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja, @Param("idSubUnitKerja") Integer idSubUnitKerja); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapPegawaiJabatanToUnitKerja.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapPegawaiJabatanToUnitKerja.java index 3e00d275..2225f519 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapPegawaiJabatanToUnitKerja.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapPegawaiJabatanToUnitKerja.java @@ -105,6 +105,10 @@ public class MapPegawaiJabatanToUnitKerja extends BaseMaster { @Column(name = "objectgradefk", insertable = false, updatable = false, nullable = true) private Integer gradeId; + @Column(name = "sumberdata", nullable = true) + @Caption(value = "Sumber Data") + private Integer sumberData; + public SubUnitKerjaPegawai getSubUnitKerjaPegawai() { return subUnitKerjaPegawai; } @@ -273,4 +277,12 @@ public class MapPegawaiJabatanToUnitKerja extends BaseMaster { this.gradeId = gradeId; } + public Integer getSumberData() { + return sumberData; + } + + public void setSumberData(Integer sumberData) { + this.sumberData = sumberData; + } + } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RiwayatJabatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RiwayatJabatan.java index a7f66398..1a4115b7 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RiwayatJabatan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RiwayatJabatan.java @@ -19,25 +19,25 @@ public class RiwayatJabatan extends BaseTransaction { /** * @author Shakato */ - + @ManyToOne @JoinColumn(name = "ObjectJenisJabatanFk") @Caption(value = "Jenis Jabatan") @NotNull(message = "Jenis Jabatan tidak boleh kosong") private JenisJabatan jenisJabatan; - + @Column(name = "ObjectJenisJabatanFk", insertable = false, updatable = false, nullable = true) private Integer jenisJabatanId; - + @ManyToOne @JoinColumn(name = "ObjectPegawaiFk") @Caption(value = "ID Pegawai") @NotNull(message = "ID Pegawai tidak boleh kosong") private Pegawai pegawai; - + @Column(name = "ObjectPegawaiFk", insertable = false, updatable = false, nullable = true) private Integer pegawaiId; - + @Column(name = "namaJabatan", nullable = true) @Caption(value = "Nama Jabatan") private String namaJabatan; @@ -45,36 +45,40 @@ public class RiwayatJabatan extends BaseTransaction { @Column(name = "noSK", nullable = true) @Caption(value = "No SK") private String noSK; - + @Column(name = "tglSK", nullable = true) @Caption(value = "Tanggal SK") private Date tglSK; - + @Column(name = "ttdSK", nullable = true) @Caption(value = "Tanda Tangan SK") private String ttdSK; - + @Column(name = "keterangan", nullable = true) @Caption(value = "Keterangan") private String keterangan; - + @ManyToOne @JoinColumn(name = "ObjectJabatanFk") @Caption(value = "ID Jabatan Pegawai") @NotNull(message = "ID Jabatan Pegawai tidak boleh kosong") private Jabatan jabatan; - + @Column(name = "ObjectJabatanFk", insertable = false, updatable = false, nullable = true) private Integer jabatanId; - + @Column(name = "tertandaPegawaiSk", nullable = true) @Caption(value = "Tertanda Pegawai SK") private String ttdPegawaiSk; - + @Column(name = "tertandaJabatanSk", nullable = true) @Caption(value = "Tertanda Pegawai SK") private String ttdJabatanSk; - + + @Column(name = "sumberdata", nullable = true) + @Caption(value = "Sumber Data") + private Integer sumberData; + public JenisJabatan getJenisJabatan() { return jenisJabatan; } @@ -177,6 +181,14 @@ public class RiwayatJabatan extends BaseTransaction { public void setTtdJabatanSk(String ttdJabatanSk) { this.ttdJabatanSk = ttdJabatanSk; - } - + } + + public Integer getSumberData() { + return sumberData; + } + + public void setSumberData(Integer sumberData) { + this.sumberData = sumberData; + } + } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiJabatanToUnitKerjaVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiJabatanToUnitKerjaVO.java index 8f6541c6..b1596d6a 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiJabatanToUnitKerjaVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapPegawaiJabatanToUnitKerjaVO.java @@ -63,6 +63,9 @@ public class MapPegawaiJabatanToUnitKerjaVO extends BaseMasterVO { private Integer gradeId; + @Caption(value = "Sumber Data") + private Integer sumberData; + public PegawaiVO getPegawai() { return pegawai; } @@ -175,4 +178,12 @@ public class MapPegawaiJabatanToUnitKerjaVO extends BaseMasterVO { this.gradeId = gradeId; } + public Integer getSumberData() { + return sumberData; + } + + public void setSumberData(Integer sumberData) { + this.sumberData = sumberData; + } + } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatJabatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatJabatanVO.java index a50b133b..2937bc12 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatJabatanVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatJabatanVO.java @@ -13,43 +13,46 @@ public class RiwayatJabatanVO extends BaseTransactionVO { @ManyToOne @Caption(value = "Jenis Jabatan") private JenisJabatanVO jenisJabatan; - + @Column(name = "ObjectJenisJabatanFk", insertable = false, updatable = false, nullable = true) private Integer jenisJabatanId; - + @ManyToOne @Caption(value = "ID Pegawai") private PegawaiVO pegawai; - + private Integer pegawaiId; - + @Caption(value = "Nama Jabatan") private String namaJabatan; @Caption(value = "No SK") private String noSK; - + @Caption(value = "Tanggal SK") private Date tglSK; - + @Caption(value = "Tanda Tangan SK") private String ttdSK; - + @Caption(value = "Keterangan") private String keterangan; - + @ManyToOne @Caption(value = "ID Jabatan Pegawai") private JabatanVO jabatan; - + private Integer jabatanId; - + @Caption(value = "Tertanda Pegawai SK") private String ttdPegawaiSk; - + @Caption(value = "Tertanda Pegawai SK") private String ttdJabatanSk; + @Caption(value = "Sumber Data") + private Integer sumberData; + public JenisJabatanVO getJenisJabatan() { return jenisJabatan; } @@ -153,5 +156,13 @@ public class RiwayatJabatanVO extends BaseTransactionVO { public void setTtdJabatanSk(String ttdJabatanSk) { this.ttdJabatanSk = ttdJabatanSk; } - + + public Integer getSumberData() { + return sumberData; + } + + public void setSumberData(Integer sumberData) { + this.sumberData = sumberData; + } + } \ No newline at end of file