- pembuatan service menampilkan grade, kelompok jabatan, dan nilai jabatan untuk rangkap jabatan

- penyesuaian service menampilkan unit kerja dan sumber data di riwayat jabatan
- perbaikan validasi ubah data kontrak kinerja terhadap data working record
- penyesuaian service simpan dan ubah sumber data di riwayat jabatan dan data jabatan pegawai
- penyesuaian service simpan riwayat jabatan terhadap relasi jenis jabatan dan master jabatan

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

@@ -70,11 +70,14 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository<MapPegaw
 
 	@Query("select new Map(m.id as id,m.pegawaiId as pegawaiId," + "m.unitKerjaPegawaiId as unitKerjaPegawaiId,"
 			+ "m.subUnitKerjaPegawaiId as subUnitKerjaPegawaiId," + "m.jabatanId as jabatanId,"
+			+ "m.nilaiJabatan as nilaiJabatan,m.gradeId as gradeId,"
 			+ "m.atasanLangsungDireksi as atasanLangsungDireksi,m.pejabatPenilaiDireksi as pejabatPenilaiDireksi,"
 			+ "m.atasanLangsungId as atasanLangsungId,m.pejabatPenilaiId as pejabatPenilaiId,"
-			+ "m.isCanCreateJadwal as isCanCreateJadwal,m.isPrimary as isPrimary,m.isMonitoring as isMonitoring,m.statusEnabled as statusEnabled) "
+			+ "m.isCanCreateJadwal as isCanCreateJadwal,m.isPrimary as isPrimary,m.isMonitoring as isMonitoring,"
-			+ "from MapPegawaiJabatanToUnitKerja m " + "where m.statusEnabled is true " + "and m.pegawaiId=:pegawaiId "
+			+ "m.sumberData as sumberDataId," + "case when m.sumberData = 1 then 'Internal' "
-			+ "order by m.id")
+			+ "when m.sumberData = 2 then 'Fungsional' " + "when m.sumberData = 3 then 'Struktural' end as sumberData,"
+			+ "m.statusEnabled as statusEnabled) " + "from MapPegawaiJabatanToUnitKerja m "
+			+ "where m.statusEnabled is true " + "and m.pegawaiId=:pegawaiId " + "order by m.id")
 	List<Map<String, Object>> findMappByPegawai(@Param("pegawaiId") Integer pegawaiId);
 
 	@Query("select distinct new Map(mapPegawai.id as id,mapPegawai.pegawaiId as pegawaiId,"

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

@@ -18,6 +18,10 @@ import com.jasamedika.medifirst2000.entities.NilaiKelompokJabatan;
 @Repository("KelompokJabatanDao")
 public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<NilaiKelompokJabatan, Integer> {
 
+	@Query("select new Map(nj.id as id,nj.detailKelompokJabatan as detailKelompokJabatan,nj.gradeDesc as grade) "
+			+ "from NilaiKelompokJabatan nj where nj.id = :id and nj.statusEnabled is true")
+	public Map<String, Object> getDetailKelompokJabatanById(@Param("id") Integer id);
+
 	@Query("select model from NilaiKelompokJabatan model where model.id = :kelompokJabatanId")
 	public NilaiKelompokJabatan getNilaiKelompokJabatan(@Param("kelompokJabatanId") Integer kelompokJabatanId);
 

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

@@ -17,29 +17,24 @@ import com.jasamedika.medifirst2000.entities.RiwayatJabatan;
 @Repository("RiwayatJabatanDao")
 public interface RiwayatJabatanDao extends PagingAndSortingRepository<RiwayatJabatan, String> {
 
-	@Query("select new Map(jab.namaJabatan as namaJabatan, jab.id as id) "+
+	@Query("select new Map(jab.namaJabatan as namaJabatan, jab.id as id) " + "from RiwayatJabatan rjab "
-			"from RiwayatJabatan rjab "+
+			+ "inner join rjab.jabatan jab " + "where rjab.statusEnabled is true "
-			"inner join rjab.jabatan jab "+
+			+ "and jab.jenisJabatanId = :idJenisJabatan " + "and rjab.pegawaiId = :idPegawai "
-			"where rjab.statusEnabled is true "+
+			+ "order by jab.namaJabatan asc")
-			"and jab.jenisJabatanId = :idJenisJabatan "+
+	public List<Map<String, Object>> getRiwayatJabatan(@Param("idPegawai") Integer idPegawai,
-			"and rjab.pegawaiId = :idPegawai "+
+			@Param("idJenisJabatan") Integer idJenisJabatan);
-			"order by jab.namaJabatan asc")
-	public List<Map<String, Object>> getRiwayatJabatan(@Param("idPegawai") Integer idPegawai, @Param("idJenisJabatan") Integer idJenisJabatan);
 
-	@Query("select new Map(rj.pegawaiId as idPgw,rj.jenisJabatanId as idJenisJabatan,rj.noRec as noRec,rj.statusEnabled as statusEnabled,"+
+	@Query("select new Map(rj.pegawaiId as idPgw," + "jb.jenisJabatanId as idJenisJabatan," + "rj.noRec as noRec,"
-		   "rj.keterangan as keterangan,rj.noSK as noSk,rj.tglSK as tglSk,rj.jabatanId as idJabatan,"+
+			+ "rj.statusEnabled as statusEnabled," + "rj.keterangan as keterangan," + "rj.noSK as noSk,"
-//		   "pgwttd.namaLengkap as namaLengkapTtd,pgwttd.nipPns as nipPgwTtd,"+
+			+ "rj.tglSK as tglSk," + "rj.jabatanId as idJabatan," + "jj.jenisJabatan as jenisJabatan,"
-		   "jj.jenisJabatan as jenisJabatan,pgw.namaLengkap as namaLengkap,"+
+			+ "pgw.namaLengkap as namaLengkap," + "jb.namaJabatan as namaJabatan," + "uk.id as unitKerjaId,"
-		   "jb.namaJabatan as namaJabatan,"+
+			+ "uk.name as unitKerja," + "rj.ttdPegawaiSk as ttdPegawaiSk," + "rj.ttdJabatanSk as ttdJabatanSk,"
-		   "rj.ttdPegawaiSk as ttdPegawaiSk, rj.ttdJabatanSk as ttdJabatanSk) "+
+			+ "rj.sumberData as sumberDataId," + "case when rj.sumberData = 1 then 'Internal' "
-		   "from RiwayatJabatan rj "+
+			+ "when rj.sumberData = 2 then 'Fungsional' "
-		   "left join rj.jenisJabatan jj "+
+			+ "when rj.sumberData = 3 then 'Struktural' end as sumberData) " + "from RiwayatJabatan rj "
-		   "left join rj.jabatan jb "+
+			+ "inner join rj.jabatan jb " + "inner join jb.unitKerja uk " + "left join jb.jenisJabatan jj "
-//		   "left join rj.jabatanTtd jbttd "+
+			+ "left join rj.pegawai pgw " + "where rj.statusEnabled is true " + "and jb.statusEnabled is true "
-		   "left join rj.pegawai pgw "+
+			+ "and uk.statusEnabled is true " + "and rj.pegawaiId = :idPegawai")
-//		   "left join rj.pegawaiTtd pgwttd "+
-		   "where rj.statusEnabled is true "+
-		   "and rj.pegawaiId = :idPegawai")
 	public List<Map<String, Object>> getDataRiwayatJabatan(@Param("idPegawai") Integer idPegawai);
 
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java

@@ -94,10 +94,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 
 	@Override
 	public LogbookKinerjaVO update(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException {
-		List<Map<String, Object>> existedWorkingRecord = new ArrayList<>();
+		List<Map<String, Object>> existedWorkingRecord = findUsedWorkingRecordByKontrak(vo.getNoRec());
-		if (!vo.getStatusVerifikasi() || !vo.getStatusEnabled()) {
-			existedWorkingRecord = findUsedWorkingRecordByKontrak(vo.getNoRec());
-		}
 
 		LogbookKinerja logbookKinerjaLama = logbookKinerjaDao.findOne(vo.getNoRec());
 

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java

@@ -21,12 +21,12 @@ import com.jasamedika.medifirst2000.dao.JenisJabatanDao;
 import com.jasamedika.medifirst2000.dao.KategoryPegawaiDao;
 import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao;
 import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaHistoriDao;
+import com.jasamedika.medifirst2000.dao.NilaiKelompokJabatanDao;
 import com.jasamedika.medifirst2000.dao.PegawaiDao;
 import com.jasamedika.medifirst2000.dao.SubUnitKerjaDao;
 import com.jasamedika.medifirst2000.dao.UnitKerjaDao;
 import com.jasamedika.medifirst2000.entities.HistoryDataPegawai;
 import com.jasamedika.medifirst2000.entities.Jabatan;
-import com.jasamedika.medifirst2000.entities.JenisJabatan;
 import com.jasamedika.medifirst2000.entities.LoginUser;
 import com.jasamedika.medifirst2000.entities.MapPegawaiJabatanToUnitKerja;
 import com.jasamedika.medifirst2000.entities.MapPegawaiJabatanToUnitKerjaHistori;
@@ -40,7 +40,6 @@ import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService;
 import com.jasamedika.medifirst2000.service.RiwayatJabatanService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.JabatanVO;
-import com.jasamedika.medifirst2000.vo.JenisJabatanVO;
 import com.jasamedika.medifirst2000.vo.MapPegawaiJabatanToUnitKerjaVO;
 import com.jasamedika.medifirst2000.vo.MappingPegawaiToAtasanVO;
 import com.jasamedika.medifirst2000.vo.PegawaiVO;
@@ -90,6 +89,9 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 	@Autowired
 	private EvaluasiJabatanDao evaluasiJabatanDao;
 
+	@Autowired
+	private NilaiKelompokJabatanDao nilaiKelompokJabatanDao;
+
 	@Autowired
 	private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
 
@@ -105,9 +107,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 	@Autowired
 	private BaseConverterImpl<MapPegawaiJabatanToUnitKerjaVO, MapPegawaiJabatanToUnitKerja> mapPegawaiJabatanToUnitKerjaConverter;
 
-	@Autowired
-	private BaseConverterImpl<JenisJabatanVO, JenisJabatan> jenisJabatanConverter;
-
 	@Override
 	@Transactional(readOnly = false)
 	public Map<String, Object> save(List<MapPegawaiJabatanToUnitKerjaVO> listVo) {
@@ -413,20 +412,33 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 					map.setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()));
 				}
 
+				if (CommonUtil.isNotNullOrEmpty(map.getSumberData())
+						&& CommonUtil.isNotNullOrEmpty(vo.getSumberData())) {
+					if (!map.getSumberData().equals(vo.getSumberData())) {
+						map.setSumberData(vo.getSumberData());
+						perubahan += "ubah sumber data penetapan jabatan, ";
+					}
+				} else if (CommonUtil.isNullOrEmpty(map.getSumberData())
+						&& CommonUtil.isNotNullOrEmpty(vo.getSumberData())) {
+					map.setSumberData(vo.getSumberData());
+					perubahan += "sumber data penetapan jabatan, ";
+				} else if (CommonUtil.isNotNullOrEmpty(map.getSumberData())
+						&& CommonUtil.isNullOrEmpty(vo.getSumberData())) {
+					map.setSumberData(vo.getSumberData());
+					perubahan += "hapus sumber data penetapan jabatan, ";
+				}
+
 				if (CommonUtil.isNotNullOrEmpty(map.getJabatanId()) && CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
 					if (!map.getJabatanId().equals(vo.getJabatan().getId())) {
 						map.setJabatan(jabatanConverter.transferVOToModel(vo.getJabatan(), new Jabatan()));
 						perubahan += "ubah jabatan, ";
 
 						RiwayatJabatanVO riwayatJabatanVo = new RiwayatJabatanVO();
-						JenisJabatanVO jenisJabatanVo = new JenisJabatanVO();
 						riwayatJabatanVo.setTglSK(new Date());
-						riwayatJabatanVo.setJenisJabatan(jenisJabatanConverter.transferModelToVO(
-								jenisJabatanDao.findOne(jabatanDao.getIdJenisJabatanByJabatan(vo.getJabatan().getId())),
-								jenisJabatanVo));
 						riwayatJabatanVo.setJabatan(vo.getJabatan());
 						riwayatJabatanVo.setNamaJabatan(vo.getJabatan().getNamaJabatan());
 						riwayatJabatanVo.setPegawai(vo.getPegawai());
+						riwayatJabatanVo.setSumberData(vo.getSumberData());
 						riwayatJabatanVo.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
 						riwayatJabatanService.add(riwayatJabatanVo);
 
@@ -447,14 +459,11 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 					perubahan += "jabatan, ";
 
 					RiwayatJabatanVO riwayatJabatanVo = new RiwayatJabatanVO();
-					JenisJabatanVO jenisJabatanVo = new JenisJabatanVO();
 					riwayatJabatanVo.setTglSK(new Date());
-					riwayatJabatanVo.setJenisJabatan(jenisJabatanConverter.transferModelToVO(
-							jenisJabatanDao.findOne(jabatanDao.getIdJenisJabatanByJabatan(vo.getJabatan().getId())),
-							jenisJabatanVo));
 					riwayatJabatanVo.setJabatan(vo.getJabatan());
 					riwayatJabatanVo.setNamaJabatan(vo.getJabatan().getNamaJabatan());
 					riwayatJabatanVo.setPegawai(vo.getPegawai());
+					riwayatJabatanVo.setSumberData(vo.getSumberData());
 					riwayatJabatanVo.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
 					riwayatJabatanService.add(riwayatJabatanVo);
 
@@ -654,19 +663,21 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 					map.setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()));
 				}
 
+				if (CommonUtil.isNotNullOrEmpty(vo.getSumberData())) {
+					map.setSumberData(vo.getSumberData());
+					perubahan += "sumber data penetapan jabatan, ";
+				}
+
 				if (CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
 					map.setJabatan(jabatanConverter.transferVOToModel(vo.getJabatan(), new Jabatan()));
 					perubahan += "jabatan, ";
 
 					RiwayatJabatanVO riwayatJabatanVo = new RiwayatJabatanVO();
-					JenisJabatanVO jenisJabatanVo = new JenisJabatanVO();
 					riwayatJabatanVo.setTglSK(new Date());
-					riwayatJabatanVo.setJenisJabatan(jenisJabatanConverter.transferModelToVO(
-							jenisJabatanDao.findOne(jabatanDao.getIdJenisJabatanByJabatan(vo.getJabatan().getId())),
-							jenisJabatanVo));
 					riwayatJabatanVo.setJabatan(vo.getJabatan());
 					riwayatJabatanVo.setNamaJabatan(vo.getJabatan().getNamaJabatan());
 					riwayatJabatanVo.setPegawai(vo.getPegawai());
+					riwayatJabatanVo.setSumberData(vo.getSumberData());
 					riwayatJabatanVo.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
 					riwayatJabatanService.add(riwayatJabatanVo);
 
@@ -1052,6 +1063,19 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 			if (CommonUtil.isNullOrEmpty(pejabatPenilai)) {
 				pejabatPenilai = pegawaiDao.getPegawaiByIdCustom(Master.EMPTY_DATA);
 			}
+			Map<String, Object> kelompokJabatan = nilaiKelompokJabatanDao
+					.getDetailKelompokJabatanById(Integer.valueOf(map.get("gradeId").toString()));
+			if (CommonUtil.isNullOrEmpty(kelompokJabatan)) {
+				kelompokJabatan = nilaiKelompokJabatanDao.getDetailKelompokJabatanById(Master.EMPTY_DATA);
+			}
+			Map<String, Object> sumberData = new HashMap<>();
+			if (CommonUtil.isNullOrEmpty(map.get("sumberDataId"))) {
+				sumberData.put("id", 0);
+				sumberData.put("sumberData", "-");
+			} else {
+				sumberData.put("id", map.get("sumberDataId"));
+				sumberData.put("sumberData", map.get("sumberData"));
+			}
 
 			mapFilter.put("id", map.get("id"));
 			mapFilter.put("pegawaiId", map.get("pegawaiId"));
@@ -1067,6 +1091,10 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 			mapFilter.put("jenisJabatan", jenisJabatan);
 			mapFilter.put("atasanLangsung", atasanLangsung);
 			mapFilter.put("pejabatPenilai", pejabatPenilai);
+			mapFilter.put("nilaiJabatan", map.get("nilaiJabatan"));
+			mapFilter.put("kelompokJabatan", kelompokJabatan);
+			mapFilter.put("grade", kelompokJabatan.get("grade"));
+			mapFilter.put("sumberData", sumberData);
 
 			result.add(mapFilter);
 		}

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java

@@ -21,8 +21,6 @@ import com.google.gson.Gson;
 import com.jasamedika.medifirst2000.constants.Master;
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.dao.HistoryDataPegawaiDao;
-import com.jasamedika.medifirst2000.dao.JabatanDao;
-import com.jasamedika.medifirst2000.dao.JenisJabatanDao;
 import com.jasamedika.medifirst2000.dao.LoginUserDao;
 import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao;
 import com.jasamedika.medifirst2000.dao.PangkatDao;
@@ -37,7 +35,6 @@ 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.JenisJabatan;
 import com.jasamedika.medifirst2000.entities.JenisKelamin;
 import com.jasamedika.medifirst2000.entities.JenisPegawai;
 import com.jasamedika.medifirst2000.entities.KategoryPegawai;
@@ -77,7 +74,6 @@ 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.JenisJabatanVO;
 import com.jasamedika.medifirst2000.vo.JenisKelaminVO;
 import com.jasamedika.medifirst2000.vo.JenisPegawaiVO;
 import com.jasamedika.medifirst2000.vo.KategoryPegawaiVO;
@@ -232,15 +228,6 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 	@Autowired
 	private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
 
-	@Autowired
-	private BaseConverterImpl<JenisJabatanVO, JenisJabatan> jenisJabatanConverter;
-
-	@Autowired
-	private JenisJabatanDao jenisJabatanDao;
-
-	@Autowired
-	private JabatanDao jabatanDao;
-
 	@Autowired
 	private RiwayatJabatanService riwayatJabatanService;
 
@@ -1688,12 +1675,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 								perubahan += "ubah jabatan, ";
 
 								RiwayatJabatanVO riwayatJabatanVo = new RiwayatJabatanVO();
-								JenisJabatanVO jenisJabatanVo = new JenisJabatanVO();
 								riwayatJabatanVo.setTglSK(new Date());
-								riwayatJabatanVo.setJenisJabatan(jenisJabatanConverter.transferModelToVO(
-										jenisJabatanDao.findOne(
-												jabatanDao.getIdJenisJabatanByJabatan(mapVo.getJabatan().getId())),
-										jenisJabatanVo));
 								riwayatJabatanVo.setJabatan(mapVo.getJabatan());
 								riwayatJabatanVo.setNamaJabatan(mapVo.getJabatan().getNamaJabatan());
 								riwayatJabatanVo.setPegawai(mapVo.getPegawai());
@@ -1706,12 +1688,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 							perubahan += "jabatan, ";
 
 							RiwayatJabatanVO riwayatJabatanVo = new RiwayatJabatanVO();
-							JenisJabatanVO jenisJabatanVo = new JenisJabatanVO();
 							riwayatJabatanVo.setTglSK(new Date());
-							riwayatJabatanVo.setJenisJabatan(jenisJabatanConverter.transferModelToVO(
-									jenisJabatanDao
-											.findOne(jabatanDao.getIdJenisJabatanByJabatan(mapVo.getJabatan().getId())),
-									jenisJabatanVo));
 							riwayatJabatanVo.setJabatan(mapVo.getJabatan());
 							riwayatJabatanVo.setNamaJabatan(mapVo.getJabatan().getNamaJabatan());
 							riwayatJabatanVo.setPegawai(mapVo.getPegawai());
@@ -1906,12 +1883,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 							perubahan += "jabatan, ";
 
 							RiwayatJabatanVO riwayatJabatanVo = new RiwayatJabatanVO();
-							JenisJabatanVO jenisJabatanVo = new JenisJabatanVO();
 							riwayatJabatanVo.setTglSK(new Date());
-							riwayatJabatanVo.setJenisJabatan(jenisJabatanConverter.transferModelToVO(
-									jenisJabatanDao
-											.findOne(jabatanDao.getIdJenisJabatanByJabatan(mapVo.getJabatan().getId())),
-									jenisJabatanVo));
 							riwayatJabatanVo.setJabatan(mapVo.getJabatan());
 							riwayatJabatanVo.setNamaJabatan(mapVo.getJabatan().getNamaJabatan());
 							riwayatJabatanVo

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatJabatanServiceImpl.java

@@ -25,7 +25,6 @@ import com.jasamedika.medifirst2000.service.RiwayatJabatanService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.RiwayatJabatanVO;
 
-
 /******************
  * @author Shakato
  ******************/
@@ -59,11 +58,13 @@ public class RiwayatJabatanServiceImpl implements RiwayatJabatanService {
 		if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) {
 			RiwayatJabatan riwayatJabatan = riwayatJabatanDao.findOne(vo.getNoRec());
 
-			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getStatusEnabled()) && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) {
+			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getStatusEnabled())
+					&& CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) {
 				if (!riwayatJabatan.getStatusEnabled().equals(vo.getStatusEnabled())) {
 					perubahan += "status hapus riwayat jabatan, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getStatusEnabled()) && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getStatusEnabled())
+					&& CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) {
 				perubahan += "status hapus riwayat jabatan, ";
 			}
 
@@ -71,9 +72,11 @@ public class RiwayatJabatanServiceImpl implements RiwayatJabatanService {
 				if (!riwayatJabatan.getNoSK().equals(vo.getNoSK())) {
 					perubahan += "ubah no sk, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getNoSK()) && CommonUtil.isNotNullOrEmpty(vo.getNoSK())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getNoSK())
+					&& CommonUtil.isNotNullOrEmpty(vo.getNoSK())) {
 				perubahan += "no sk, ";
-			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getNoSK()) && CommonUtil.isNullOrEmpty(vo.getNoSK())) {
+			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getNoSK())
+					&& CommonUtil.isNullOrEmpty(vo.getNoSK())) {
 				perubahan += "hapus no sk, ";
 			}
 
@@ -81,49 +84,63 @@ public class RiwayatJabatanServiceImpl implements RiwayatJabatanService {
 				if (!riwayatJabatan.getTglSK().equals(new Timestamp(vo.getTglSK().getTime()))) {
 					perubahan += "ubah tanggal sk, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getTglSK()) && CommonUtil.isNotNullOrEmpty(vo.getTglSK())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getTglSK())
+					&& CommonUtil.isNotNullOrEmpty(vo.getTglSK())) {
 				perubahan += "tanggal sk, ";
-			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTglSK()) && CommonUtil.isNullOrEmpty(vo.getTglSK())) {
+			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTglSK())
+					&& CommonUtil.isNullOrEmpty(vo.getTglSK())) {
 				perubahan += "hapus tanggal sk, ";
 			}
 
-			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getJenisJabatanId()) && CommonUtil.isNotNullOrEmpty(vo.getJenisJabatan())) {
+			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getSumberData())
-				if (!riwayatJabatan.getJenisJabatanId().equals(vo.getJenisJabatan().getId())) {
+					&& CommonUtil.isNotNullOrEmpty(vo.getSumberData())) {
-					perubahan += "ubah jenis jabatan, ";
+				if (!riwayatJabatan.getSumberData().equals(vo.getSumberData())) {
+					perubahan += "ubah sumber data, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getJenisJabatanId()) && CommonUtil.isNotNullOrEmpty(vo.getJenisJabatan())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getSumberData())
-				perubahan += "jenis jabatan, ";
+					&& CommonUtil.isNotNullOrEmpty(vo.getSumberData())) {
-			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getJenisJabatanId()) && CommonUtil.isNullOrEmpty(vo.getJenisJabatan())) {
+				perubahan += "sumber data, ";
-				perubahan += "hapus jenis jabatan, ";
+			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getSumberData())
+					&& CommonUtil.isNullOrEmpty(vo.getSumberData())) {
+				perubahan += "hapus sumber data, ";
 			}
 
-			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getJabatanId()) && CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
+			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getJabatanId())
+					&& CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
 				if (!riwayatJabatan.getJabatanId().equals(vo.getJabatan().getId())) {
 					perubahan += "ubah jabatan, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getJabatanId()) && CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getJabatanId())
+					&& CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
 				perubahan += "jabatan, ";
-			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getJabatanId()) && CommonUtil.isNullOrEmpty(vo.getJabatan())) {
+			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getJabatanId())
+					&& CommonUtil.isNullOrEmpty(vo.getJabatan())) {
 				perubahan += "hapus jabatan, ";
 			}
 
-			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdPegawaiSk()) && CommonUtil.isNotNullOrEmpty(vo.getTtdPegawaiSk())) {
+			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdPegawaiSk())
+					&& CommonUtil.isNotNullOrEmpty(vo.getTtdPegawaiSk())) {
 				if (!riwayatJabatan.getTtdPegawaiSk().equals(vo.getTtdPegawaiSk())) {
 					perubahan += "ubah tertanda pegawai sk, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getTtdPegawaiSk()) && CommonUtil.isNotNullOrEmpty(vo.getTtdPegawaiSk())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getTtdPegawaiSk())
+					&& CommonUtil.isNotNullOrEmpty(vo.getTtdPegawaiSk())) {
 				perubahan += "tertanda pegawai sk, ";
-			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdPegawaiSk()) && CommonUtil.isNullOrEmpty(vo.getTtdPegawaiSk())) {
+			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdPegawaiSk())
+					&& CommonUtil.isNullOrEmpty(vo.getTtdPegawaiSk())) {
 				perubahan += "hapus tertanda pegawai sk, ";
 			}
 
-			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdJabatanSk()) && CommonUtil.isNotNullOrEmpty(vo.getTtdJabatanSk())) {
+			if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdJabatanSk())
+					&& CommonUtil.isNotNullOrEmpty(vo.getTtdJabatanSk())) {
 				if (!riwayatJabatan.getTtdJabatanSk().equals(vo.getTtdJabatanSk())) {
 					perubahan += "ubah tertanda jabatan sk, ";
 				}
-			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getTtdJabatanSk()) && CommonUtil.isNotNullOrEmpty(vo.getTtdJabatanSk())) {
+			} else if (CommonUtil.isNullOrEmpty(riwayatJabatan.getTtdJabatanSk())
+					&& CommonUtil.isNotNullOrEmpty(vo.getTtdJabatanSk())) {
 				perubahan += "tertanda jabatan sk, ";
-			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdJabatanSk()) && CommonUtil.isNullOrEmpty(vo.getTtdJabatanSk())) {
+			} else if (CommonUtil.isNotNullOrEmpty(riwayatJabatan.getTtdJabatanSk())
+					&& CommonUtil.isNullOrEmpty(vo.getTtdJabatanSk())) {
 				perubahan += "hapus tertanda jabatan sk, ";
 			}
 		} else {
@@ -135,8 +152,8 @@ public class RiwayatJabatanServiceImpl implements RiwayatJabatanService {
 				perubahan += "tanggal sk, ";
 			}
 
-			if (CommonUtil.isNotNullOrEmpty(vo.getJenisJabatan())) {
+			if (CommonUtil.isNotNullOrEmpty(vo.getSumberData())) {
-				perubahan += "jenis jabatan, ";
+				perubahan += "sumber data, ";
 			}
 
 			if (CommonUtil.isNotNullOrEmpty(vo.getJabatan())) {
@@ -174,7 +191,9 @@ public class RiwayatJabatanServiceImpl implements RiwayatJabatanService {
 				historyDataPegawai.setPetugas(loginUser.getPegawai());
 			}
 
-//			RiwayatJabatanVO data = riwayatJabatanConverter.transferModelToVO(model, new RiwayatJabatanVO());
+			// RiwayatJabatanVO data =
+			// riwayatJabatanConverter.transferModelToVO(model, new
+			// RiwayatJabatanVO());
 
 			Gson gson = new Gson();
 			String detail = gson.toJson(vo);

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RiwayatJabatan.java

@@ -20,15 +20,6 @@ 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")
@@ -79,22 +70,6 @@ public class RiwayatJabatan extends BaseTransaction {
 	@Caption(value = "Sumber Data")
 	private Integer sumberData;
 
-	public JenisJabatan getJenisJabatan() {
-		return jenisJabatan;
-	}
-
-	public void setJenisJabatan(JenisJabatan jenisJabatan) {
-		this.jenisJabatan = jenisJabatan;
-	}
-
-	public Integer getJenisJabatanId() {
-		return jenisJabatanId;
-	}
-
-	public void setJenisJabatanId(Integer jenisJabatanId) {
-		this.jenisJabatanId = jenisJabatanId;
-	}
-
 	public String getNamaJabatan() {
 		return namaJabatan;
 	}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatJabatanVO.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.vo;
 
 import java.util.Date;
 
-import javax.persistence.Column;
 import javax.persistence.ManyToOne;
 
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
@@ -10,13 +9,6 @@ import com.jasamedika.medifirst2000.helper.Caption;
 
 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;
@@ -53,22 +45,6 @@ public class RiwayatJabatanVO extends BaseTransactionVO {
 	@Caption(value = "Sumber Data")
 	private Integer sumberData;
 
-	public JenisJabatanVO getJenisJabatan() {
-		return jenisJabatan;
-	}
-
-	public void setJenisJabatan(JenisJabatanVO jenisJabatan) {
-		this.jenisJabatan = jenisJabatan;
-	}
-
-	public Integer getJenisJabatanId() {
-		return jenisJabatanId;
-	}
-
-	public void setJenisJabatanId(Integer jenisJabatanId) {
-		this.jenisJabatanId = jenisJabatanId;
-	}
-
 	public PegawaiVO getPegawai() {
 		return pegawai;
 	}