- 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

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java

@@ -42,8 +42,8 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
 			@Param("totalNilai") Integer totalNilai);
 
 	@Query("select distinct new Map(j.id as idJabatan," + "uk.name as unitKerja," + "j.namaJabatan as namaJabatan) "
-			+ "from EvaluasiJabatan ej " + "left join ej.jabatan j with j.statusEnabled is true "
-			+ "left join j.unitKerja uk with uk.statusEnabled is true " + "where ej.statusEnabled is true "
+			+ "from EvaluasiJabatan ej " + "inner join ej.jabatan j " + "inner join j.unitKerja uk "
+			+ "where ej.statusEnabled is true and j.statusEnabled is true and uk.statusEnabled is true "
 			+ "order by uk.name, j.namaJabatan asc")
 	List<Map<String, Object>> findDistinctEvaluasiJabatan();
 
@@ -56,7 +56,7 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
 			+ "f8.profile as f8,f9.profile as f9,f10.profile as f10,"
 			+ "fa.profile as fa,fb.profile as fb,fc.profile as fc,fd.profile as fd,fe.profile as fe,ff.profile as ff,"
 			+ "fg.profile as fg,fh.profile as fh,fi.profile as fi,fj.profile as fj,fk.profile as fk,fl.profile as fl,"
-			+ "cast(ej.totalNilai as long) as nilaiJabatan) " + "from EvaluasiJabatan ej " + "left join ej.jabatan j "
+			+ "cast(ej.totalNilai as long) as nilaiJabatan) " + "from EvaluasiJabatan ej " + "inner join ej.jabatan j "
 			+ "inner join j.unitKerja uk " + "left join ej.grade nj " + "left join ej.faktor1 f1 "
 			+ "left join ej.faktor2 f2 " + "left join ej.faktor3 f3 " + "left join ej.faktor4 f4 "
 			+ "left join ej.faktor5 f5 " + "left join ej.faktor7 f7 " + "left join ej.faktor8 f8 "
@@ -65,7 +65,7 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
 			+ "left join ej.faktorE fe " + "left join ej.faktorF ff " + "left join ej.faktorG fg "
 			+ "left join ej.faktorH fh " + "left join ej.faktorI fi " + "left join ej.faktorJ fj "
 			+ "left join ej.faktorK fk " + "left join ej.faktorL fl "
-			+ "where ej.statusEnabled is true and uk.statusEnabled is true "
+			+ "where ej.statusEnabled is true and j.statusEnabled is true and uk.statusEnabled is true "
 			+ "order by uk.name asc, j.namaJabatan asc, ej.tglHitung desc")
 	List<Map<String, Object>> findAllEvaluasiJabatan();
 

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java

@@ -845,11 +845,11 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
 			+ "inner join mapPegawai.jabatan jabatan " + "where mapPegawai.jabatan.namaJabatan like %:namaJabatan%")
 	public Map<String, Object> 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<Integer> getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja,
 			@Param("idSubUnitKerja") Integer idSubUnitKerja);
 

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;
+	}
+
 }

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;
+	}
+
 }

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;
+	}
+
 }

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;
+	}
+
 }