diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/MapPegawaiJabatanToUnitKerjaConverter.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/MapPegawaiJabatanToUnitKerjaConverter.java index bb9543be..9738328d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/MapPegawaiJabatanToUnitKerjaConverter.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/MapPegawaiJabatanToUnitKerjaConverter.java @@ -14,40 +14,40 @@ import org.springframework.stereotype.Component; import com.google.gson.Gson; import com.jasamedika.medifirst2000.converter.base.BaseVoConverter; import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.vo.PegawaiVO_; +import com.jasamedika.medifirst2000.vo.PegawaiJabatanVO; @Component -public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter { +public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter { @Override - public Pegawai transferVOToModel(PegawaiVO_ vo, Pegawai model) { + public Pegawai transferVOToModel(PegawaiJabatanVO vo, Pegawai model) { if (null == model) model = new Pegawai(); try { String[] fieldsToInclude = null; - Map serialized = vo.serialize(fieldsToInclude,vo.getClass().getName()); + Map serialized = vo.serialize(fieldsToInclude, vo.getClass().getName()); Gson gson = new Gson(); - String json = gson.toJson(serialized); - model = gson.fromJson(json, Pegawai.class); + String json = gson.toJson(serialized); + model = gson.fromJson(json, Pegawai.class); } catch (Exception e) { e.printStackTrace(); } - + return model; } @Override - public List transferListOfModelToListOfVO(List models, List vos) { + public List transferListOfModelToListOfVO(List models, List vos) { if (null == vos) - vos = new ArrayList(); + vos = new ArrayList(); if (null == models) return vos; for (Pegawai pegawai : models) { - PegawaiVO_ vo = new PegawaiVO_(); - vo=transferModelToVO(pegawai, vo); + PegawaiJabatanVO vo = new PegawaiJabatanVO(); + vo = transferModelToVO(pegawai, vo); vos.add(vo); } @@ -55,47 +55,49 @@ public class MapPegawaiJabatanToUnitKerjaConverter implements BaseVoConverter fieldsToInclude = new ArrayList(); for (Field field : model.GetFields(model.getClass())) { String str = field.getName(); String name = field.getName(); - if(name.equals("serialVersionUID"))continue; + if (name.equals("serialVersionUID")) + continue; Boolean valid = false; for (java.lang.annotation.Annotation annotation : field.getDeclaredAnnotations()) { if (annotation instanceof JoinColumn) { - valid=true; + valid = true; } else if (annotation instanceof Column) { - Column column = (Column)annotation; - if(column.name().endsWith("Fk")) - if(field.getName().endsWith("Id")==false) - valid=true; - }else if (annotation instanceof OneToMany) { - - valid=true; + Column column = (Column) annotation; + if (column.name().endsWith("Fk")) + if (field.getName().endsWith("Id") == false) + valid = true; + } else if (annotation instanceof OneToMany) { + + valid = true; } - + } - if(valid ==false) + if (valid == false) fieldsToInclude.add(str); - + } Map serialized = model.ToMap(); Gson gson = new Gson(); -// serialized.put("jenisPegawai", model.getJenisPegawai()); -// serialized.put("pegawai", model.getId()); -// serialized.put("jabatanInternal", model.getJabatanInternal()); -// serialized.put("unitKerja", model.getUnitKerja()); + // serialized.put("jenisPegawai", model.getJenisPegawai()); + // serialized.put("pegawai", model.getId()); + // serialized.put("jabatanInternal", model.getJabatanInternal()); + // serialized.put("unitKerja", model.getUnitKerja()); serialized.put("unitKerjaPegawai", model.getUnitKerja().getUnitKerja()); - serialized.put("isCanCreateJadwal", model.getJabatanInternal().getNamaJabatan().contains("Kepala")? true : false); + serialized.put("isCanCreateJadwal", + model.getJabatanInternal().getNamaJabatan().contains("Kepala") ? true : false); serialized.put("isPrimary", true); serialized.put("statusEnabled1", true); - String json = gson.toJson(serialized); - vo = gson.fromJson(json, PegawaiVO_.class); + String json = gson.toJson(serialized); + vo = gson.fromJson(json, PegawaiJabatanVO.class); } catch (Exception e) { e.printStackTrace(); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java index 3dbcb6fa..70f8f6e3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IpsrsPerbaikanServiceImpl.java @@ -7,8 +7,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.IpsrsPelaksanaanPerbaikanDao; import com.jasamedika.medifirst2000.dao.IpsrsPerbaikanDao; @@ -20,7 +22,6 @@ import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikanListTeknis import com.jasamedika.medifirst2000.entities.IpsrsPelaksanaanPerbaikanSukuCadang; import com.jasamedika.medifirst2000.entities.IpsrsPerbaikan; import com.jasamedika.medifirst2000.entities.IpsrsStatusPerbaikan; -import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.RegistrasiAset; import com.jasamedika.medifirst2000.entities.Ruangan; @@ -41,189 +42,190 @@ import com.jasamedika.medifirst2000.vo.RuanganVO; import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO; @Service("ipsrsPerbaikanService") -public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{ +public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService { @Autowired private IpsrsPerbaikanDao ipsrsPerbaikanDao; - + @Autowired private StrukOrderDao strukOrderRuanganDao; - + @Autowired private IpsrsStatusPerbaikanDao ipsrsStatusPerbaikanDao; - + @Autowired private IpsrsPelaksanaanPerbaikanDao ipsrsPelaksanaanPerbaikanDao; @Autowired private RuanganDao ruanganDao; - + @Autowired - private BaseConverterImpl ipsrsPerbaikanConverter; - + private BaseConverterImpl ipsrsPerbaikanConverter; + @Autowired - private BaseConverterImpl registrasiAsetConverter; - + private BaseConverterImpl registrasiAsetConverter; + @Autowired - private BaseConverterImpl pegawaiConverter; - + private BaseConverterImpl pegawaiConverter; + @Autowired - private BaseConverterImpl ipsrsStatusPerbaikanConverter; - + private BaseConverterImpl ipsrsStatusPerbaikanConverter; + @Autowired - private BaseConverterImpl ipsrsPelaksanaanPerbaikanConverter; - + private BaseConverterImpl ipsrsPelaksanaanPerbaikanConverter; + @Autowired - private BaseConverterImpl ipsrsPelaksanaanPerbaikanTambahBarangConverter; - + private BaseConverterImpl ipsrsPelaksanaanPerbaikanTambahBarangConverter; + @Autowired - private BaseConverterImpl ipsrsPelaksanaanPerbaikanListpegawaiConverter; - + private BaseConverterImpl ipsrsPelaksanaanPerbaikanListpegawaiConverter; + @Autowired - private BaseConverterImpl stokProdukGlobalConverter; - + private BaseConverterImpl stokProdukGlobalConverter; + @Autowired - private BaseConverterImpl ruanganConverter; - + private BaseConverterImpl ruanganConverter; + @Autowired private LoginUserService loginUserService; - @Override public Map getUserLogin() { - Map result = new HashMap(); + Map result = new HashMap(); Pegawai pegawai = loginUserService.getLoginUser().getPegawai(); - if(CommonUtil.isNotNullOrEmpty(pegawai)){ + if (CommonUtil.isNotNullOrEmpty(pegawai)) { result.put("name", pegawai.getNamaLengkap()); result.put("idPegawai", pegawai.getId()); result.put("idRuangan", pegawai.getRuangan().getId()); } return result; } - + @Override - public Map getNoOrderTable(){ + public Map getNoOrderTable() { Map result = new HashMap<>(); List list = ipsrsPerbaikanDao.noOrder(); - - if(CommonUtil.isNotNullOrEmpty(list)){ - Integer data = Integer.parseInt(list.get(list.size()-1).substring(2))+1; - result.put("noOrder", "PR"+data); - } else{ + + if (CommonUtil.isNotNullOrEmpty(list)) { + Integer data = Integer.parseInt(list.get(list.size() - 1).substring(2)) + 1; + result.put("noOrder", "PR" + data); + } else { result.put("noOrder", noOrderPerbaikan()); } return result; } - + @Override public String noOrderPerbaikan() { - Date dateNow=new Date(); - Integer month=DateUtil.getMonthFromDate(dateNow); - Integer year=DateUtil.getYearFromDate(dateNow); - Long count=ipsrsPerbaikanDao.count(); - - String monthNow=month.toString(); - String yearNow=year.toString().substring(2, 4); - String noOrder=null; - - count++; - if(count.toString().length()==1){ - noOrder="000";} - else if(count.toString().length()==2){ - noOrder="00";} - else if(count.toString().length()==3){ - noOrder="0";} - if(monthNow.length()==1) - monthNow = "0"+monthNow; + Date dateNow = new Date(); + Integer month = DateUtil.getMonthFromDate(dateNow); + Integer year = DateUtil.getYearFromDate(dateNow); + Long count = ipsrsPerbaikanDao.count(); - return "PR"+yearNow+monthNow+noOrder+count; + String monthNow = month.toString(); + String yearNow = year.toString().substring(2, 4); + String noOrder = null; + + count++; + if (count.toString().length() == 1) { + noOrder = "000"; + } else if (count.toString().length() == 2) { + noOrder = "00"; + } else if (count.toString().length() == 3) { + noOrder = "0"; + } + if (monthNow.length() == 1) + monthNow = "0" + monthNow; + + return "PR" + yearNow + monthNow + noOrder + count; } - + @Override - public Map getRuanganPerbaikan(){ + public Map getRuanganPerbaikan() { Map result = new HashMap<>(); List ruanganAset = ruanganDao.getRuanganOnAset(); result.put("ruanganAset", ruanganAset); return result; } - + @Override - public Map getAsetPerbaikan(Integer id){ + public Map getAsetPerbaikan(Integer id) { Map result = new HashMap<>(); List> ipsrsPerbaikan = new ArrayList<>(); List> listPelapor = new ArrayList<>(); - if(CommonUtil.isNotNullOrEmpty(id)){ - for(Map mapping : ipsrsPerbaikanDao.getAllRegistrasiByRuangan(id)){ - if(CommonUtil.isNullOrEmpty(mapping.get("noRec"))){ + if (CommonUtil.isNotNullOrEmpty(id)) { + for (Map mapping : ipsrsPerbaikanDao.getAllRegistrasiByRuangan(id)) { + if (CommonUtil.isNullOrEmpty(mapping.get("noRec"))) { mapping.put("noRec", "-"); - } - if(CommonUtil.isNullOrEmpty(mapping.get("noSeri"))){ + } + if (CommonUtil.isNullOrEmpty(mapping.get("noSeri"))) { mapping.put("noSeri", "-"); - } - if(CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))){ + } + if (CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))) { mapping.put("kdProduk", "-"); } - if(CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))){ + if (CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))) { mapping.put("namaProduk", "-"); - } - if(CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))){ + } + if (CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))) { mapping.put("merkProduk", "-"); } - if(CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))){ + if (CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))) { mapping.put("typeProduk", "-"); } ipsrsPerbaikan.add(mapping); } listPelapor = ipsrsPerbaikanDao.getPegawaiByRuangan(id); } - if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) { result.put("dataAset", ipsrsPerbaikan); result.put("pelapor", listPelapor); } return result; } - + @Override - public Map savePermintaanPerbaikan(IpsrsPerbaikanVO vo){ + public Map savePermintaanPerbaikan(IpsrsPerbaikanVO vo) { Map result = new HashMap<>(); IpsrsPerbaikan ipsrsPerbaikan = new IpsrsPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo)){ + if (CommonUtil.isNotNullOrEmpty(vo)) { ipsrsPerbaikan = ipsrsPerbaikanConverter.transferVOToModel(vo, new IpsrsPerbaikan()); ipsrsPerbaikan.setNoOrder(noOrderPerbaikan()); } - if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){ - ipsrsPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); + if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) { + ipsrsPerbaikan.setRegistrasiAset( + registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); } - if(CommonUtil.isNotNullOrEmpty(vo.getPelapor())){ + if (CommonUtil.isNotNullOrEmpty(vo.getPelapor())) { ipsrsPerbaikan.setPelapor(pegawaiConverter.transferVOToModel(vo.getPelapor(), new Pegawai())); } - if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) { IpsrsStatusPerbaikan ipsrsStatusPerbaikan = new IpsrsStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){ - ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter. - transferVOToModel(vo.getIpsrsStatusPerbaikan(), new IpsrsStatusPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) { + ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter.transferVOToModel(vo.getIpsrsStatusPerbaikan(), + new IpsrsStatusPerbaikan()); ipsrsStatusPerbaikan.setIpsrsPerbaikan(ipsrsPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)) { ipsrsPerbaikan.setIpsrsStatusPerbaikan(ipsrsStatusPerbaikan); } - + } - - if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){ + + if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) { IpsrsPerbaikan model = ipsrsPerbaikanDao.save(ipsrsPerbaikan); - if(CommonUtil.isNotNullOrEmpty(model)){ + if (CommonUtil.isNotNullOrEmpty(model)) { StrukOrder strukOrder = new StrukOrder(); strukOrder.setNoOrder(model.getNoOrder()); strukOrder.setTglOrder(model.getTglPesan()); strukOrder.setIsDelivered((byte) 1); - + strukOrder.setKeteranganKeperluan(model.getKeluhan()); strukOrder.setKeteranganLainnya(model.getKeluhan()); strukOrder.setKeteranganOrder("Permintaan Perbaikan Dari Ruangan"); strukOrder.setRuangan(model.getRegistrasiAset().getRuangan()); strukOrder.setPegawaiOrder(model.getPelapor()); - + strukOrder.setQtyJenisProduk(0.00); strukOrder.setQtyProduk(0.00); strukOrder.setTotalBeaMaterai(0.00); @@ -236,151 +238,160 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{ strukOrder.setTotalPpn(0.00); strukOrderRuanganDao.save(strukOrder); } - + result.put("tglPesan", model.getTglPesan()); result.put("produk", ""); result.put("ruangan", ""); result.put("namaPelapor", ""); result.put("keluhan", model.getKeluhan()); - + } return result; } - + @Override public Map getAllPermintaanPerbaikan() { Map result = new HashMap<>(); - List> listPermintaanPerbaikan = - ipsrsPerbaikanDao.getAllPermintaanPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)){ + List> listPermintaanPerbaikan = ipsrsPerbaikanDao.getAllPermintaanPerbaikan(); + if (CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)) { result.put("listPermintaanPerbaikan", listPermintaanPerbaikan); - } + } return result; } - + @Override - public Map getOnePermintaanPerbaikan(String noRec){ + public Map getOnePermintaanPerbaikan(String noRec) { Map result = new HashMap<>(); IpsrsPerbaikan ipsrsPerbaikan = ipsrsPerbaikanDao.findOne(noRec); - if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) { IpsrsStatusPerbaikan ipsrsStatusPerbaikan = ipsrsPerbaikan.getIpsrsStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())) { Long dateTime = Math.abs(DateUtil.now().getTime() - ipsrsPerbaikan.getTglPesan().getTime()); long inMinute = dateTime / 60000; - if(inMinute<15){ + if (inMinute < 15) { ipsrsStatusPerbaikan.setStatusRespon(1); ipsrsStatusPerbaikan.setWaktuRespon(inMinute); ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan); - } else if(inMinute>=15 && inMinute<=30){ + } else if (inMinute >= 15 && inMinute <= 30) { ipsrsStatusPerbaikan.setStatusRespon(2); ipsrsStatusPerbaikan.setWaktuRespon(inMinute); ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan); - } else if(inMinute>30){ + } else if (inMinute > 30) { ipsrsStatusPerbaikan.setStatusRespon(3); ipsrsStatusPerbaikan.setWaktuRespon(inMinute); ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan); } } } - - if(CommonUtil.isNotNullOrEmpty(noRec)){ + + if (CommonUtil.isNotNullOrEmpty(noRec)) { Map permintaanPerbaikan = ipsrsPerbaikanDao.getOnePermintaanPerbaikan(noRec); List listRuangan = ruanganDao.getRuanganOnAset(); - List> listIpsrsPerbaikan = ipsrsPerbaikanDao.getAllRegistrasiByRuangan(ipsrsPerbaikan.getRegistrasiAset().getRuanganId()); - List> listUser = ipsrsPerbaikanDao.getPegawaiByRuangan((Integer)permintaanPerbaikan.get("id")); + List> listIpsrsPerbaikan = ipsrsPerbaikanDao + .getAllRegistrasiByRuangan(ipsrsPerbaikan.getRegistrasiAset().getRuanganId()); + List> listUser = ipsrsPerbaikanDao + .getPegawaiByRuangan((Integer) permintaanPerbaikan.get("id")); List> listTeknisi = ipsrsPerbaikanDao.getTeknisi(); - List> listSukuCadang = ipsrsPerbaikanDao.getSukuCadang(); - if(CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)){ + List> listSukuCadang = ipsrsPerbaikanDao.getSukuCadang(); + if (CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)) { result.put("listIpsrsPerbaikan", listIpsrsPerbaikan); result.put("permintaanPerbaikan", permintaanPerbaikan); result.put("sukuCadang", listSukuCadang); result.put("listUser", listUser); result.put("listRuangan", listRuangan); result.put("listTeknisi", listTeknisi); - } + } } return result; } - + @Override - public Map savePelaksanaanPerbaikan(IpsrsPelaksanaanPerbaikanVO vo){ - Map result = new HashMap<>(); + public Map savePelaksanaanPerbaikan(IpsrsPelaksanaanPerbaikanVO vo) { + Map result = new HashMap<>(); IpsrsPerbaikan ipsrsPerbaikan = ipsrsPerbaikanDao.findOne(vo.getNoRecIpsrsPerbaikan()); - if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan.getIpsrsStatusPerbaikan())) { IpsrsStatusPerbaikan ipsrsStatusPerbaikan = ipsrsPerbaikan.getIpsrsStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())) { ipsrsStatusPerbaikan.setStatusPengerjaan(vo.getStatusPengerjaan()); } - if(CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())){ + if (CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())) { ipsrsStatusPerbaikan.setKetStatusRespon(vo.getKetStatusRespon()); } - if(CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)) { ipsrsStatusPerbaikanDao.save(ipsrsStatusPerbaikan); } } - - if(CommonUtil.isNullOrEmpty(ipsrsPerbaikan.getIpsrsPelaksanaanPerbaikan())){ + + if (CommonUtil.isNullOrEmpty(ipsrsPerbaikan.getIpsrsPelaksanaanPerbaikan())) { IpsrsPelaksanaanPerbaikan ipsrsPelaksanaanPerbaikan = new IpsrsPelaksanaanPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo)){ - ipsrsPelaksanaanPerbaikan = ipsrsPelaksanaanPerbaikanConverter.transferVOToModel(vo, new IpsrsPelaksanaanPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(vo)) { + ipsrsPelaksanaanPerbaikan = ipsrsPelaksanaanPerbaikanConverter.transferVOToModel(vo, + new IpsrsPelaksanaanPerbaikan()); ipsrsPelaksanaanPerbaikan.setIpsrsPerbaikan(ipsrsPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(vo.getUser())){ + if (CommonUtil.isNotNullOrEmpty(vo.getUser())) { ipsrsPelaksanaanPerbaikan.setUser(pegawaiConverter.transferVOToModel(vo.getUser(), new Pegawai())); } - if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)) { ipsrsPerbaikan.setIpsrsPelaksanaanPerbaikan(ipsrsPelaksanaanPerbaikan); } - + Set listSukuCadang = new HashSet<>(); - if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanSukuCadang())){ - for(IpsrsPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getIpsrsPelaksanaanPerbaikanSukuCadang()){ + if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanSukuCadang())) { + for (IpsrsPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo + .getIpsrsPelaksanaanPerbaikanSukuCadang()) { IpsrsPelaksanaanPerbaikanSukuCadang ipsrsPelaksanaanPerbaikanTambahBarang = new IpsrsPelaksanaanPerbaikanSukuCadang(); - if(CommonUtil.isNotNullOrEmpty(modelBarangVO)){ - ipsrsPelaksanaanPerbaikanTambahBarang = ipsrsPelaksanaanPerbaikanTambahBarangConverter.transferVOToModel(modelBarangVO, new IpsrsPelaksanaanPerbaikanSukuCadang()); + if (CommonUtil.isNotNullOrEmpty(modelBarangVO)) { + ipsrsPelaksanaanPerbaikanTambahBarang = ipsrsPelaksanaanPerbaikanTambahBarangConverter + .transferVOToModel(modelBarangVO, new IpsrsPelaksanaanPerbaikanSukuCadang()); ipsrsPelaksanaanPerbaikanTambahBarang.setIpsrsPelaksanaanPerbaikan(ipsrsPelaksanaanPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())){ - ipsrsPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter.transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal())); + if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())) { + ipsrsPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter + .transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal())); } - if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())){ - ipsrsPelaksanaanPerbaikanTambahBarang.setTujuanRuangan(ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan())); + if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())) { + ipsrsPelaksanaanPerbaikanTambahBarang.setTujuanRuangan( + ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan())); } listSukuCadang.add(ipsrsPelaksanaanPerbaikanTambahBarang); } ipsrsPelaksanaanPerbaikan.setIpsrsPelaksanaanPerbaikanSukuCadang(listSukuCadang); } - + Set listTeknisi = new HashSet<>(); - if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanListTeknisi())){ - for(IpsrsPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getIpsrsPelaksanaanPerbaikanListTeknisi()){ + if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsPelaksanaanPerbaikanListTeknisi())) { + for (IpsrsPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo + .getIpsrsPelaksanaanPerbaikanListTeknisi()) { IpsrsPelaksanaanPerbaikanListTeknisi ipsrsPelaksanaanPerbaikanListTeknisi = new IpsrsPelaksanaanPerbaikanListTeknisi(); - if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO)){ - ipsrsPelaksanaanPerbaikanListTeknisi = ipsrsPelaksanaanPerbaikanListpegawaiConverter.transferVOToModel(modelTeknisiVO, new IpsrsPelaksanaanPerbaikanListTeknisi()); + if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO)) { + ipsrsPelaksanaanPerbaikanListTeknisi = ipsrsPelaksanaanPerbaikanListpegawaiConverter + .transferVOToModel(modelTeknisiVO, new IpsrsPelaksanaanPerbaikanListTeknisi()); ipsrsPelaksanaanPerbaikanListTeknisi.setIpsrsPelaksanaanPerbaikan(ipsrsPelaksanaanPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())){ - ipsrsPelaksanaanPerbaikanListTeknisi.setTeknisi(pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai())); + if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())) { + ipsrsPelaksanaanPerbaikanListTeknisi.setTeknisi( + pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai())); } listTeknisi.add(ipsrsPelaksanaanPerbaikanListTeknisi); } ipsrsPelaksanaanPerbaikan.setIpsrsPelaksanaanPerbaikanListTeknisi(listTeknisi); } - - if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)){ + + if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)) { IpsrsPelaksanaanPerbaikan model = ipsrsPelaksanaanPerbaikanDao.save(ipsrsPelaksanaanPerbaikan); - if(CommonUtil.isNotNullOrEmpty(model)){ + if (CommonUtil.isNotNullOrEmpty(model)) { StrukOrder strukOrder = new StrukOrder(); strukOrder.setNoOrder(""); strukOrder.setTglOrder(model.getTglMulaiPeriksa()); strukOrder.setIsDelivered((byte) 1); - + strukOrder.setKeteranganKeperluan(model.getAnalisaTeknisi()); strukOrder.setKeteranganLainnya(model.getAnalisaKerusakan()); strukOrder.setKeteranganOrder("Permintaan suku cadang perbaikan dari IP3RS"); strukOrder.setRuangan(model.getIpsrsPerbaikan().getRegistrasiAset().getRuangan()); strukOrder.setPegawaiOrder(model.getUser()); - + strukOrder.setQtyJenisProduk(0.00); strukOrder.setQtyProduk(0.00); strukOrder.setTotalBeaMaterai(0.00); @@ -392,44 +403,46 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{ strukOrder.setTotalPph(0.00); strukOrder.setTotalPpn(0.00); strukOrderRuanganDao.save(strukOrder); - } + } result.put("noRec", model.getNoRec()); - } + } } - + return result; } - + @Override - public Map getAllIpsrsPerbaikanByNoRec(String noRec){ + public Map getAllIpsrsPerbaikanByNoRec(String noRec) { Map result = new HashMap<>(); IpsrsPelaksanaanPerbaikan ipsrsPelaksanaanPerbaikan = ipsrsPerbaikanDao.getAllIpsrsPerbaikanByNoRec(noRec); List listBarang = new ArrayList<>(); - if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanSukuCadang())){ - for(IpsrsPelaksanaanPerbaikanSukuCadang listModel : ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanSukuCadang()){ - if(CommonUtil.isNotNullOrEmpty(listModel)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanSukuCadang())) { + for (IpsrsPelaksanaanPerbaikanSukuCadang listModel : ipsrsPelaksanaanPerbaikan + .getIpsrsPelaksanaanPerbaikanSukuCadang()) { + if (CommonUtil.isNotNullOrEmpty(listModel)) { listBarang.add(listModel); } } } - + List listTeknisi = new ArrayList<>(); - if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanListTeknisi())){ - for(IpsrsPelaksanaanPerbaikanListTeknisi listModel : ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanListTeknisi()){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan.getIpsrsPelaksanaanPerbaikanListTeknisi())) { + for (IpsrsPelaksanaanPerbaikanListTeknisi listModel : ipsrsPelaksanaanPerbaikan + .getIpsrsPelaksanaanPerbaikanListTeknisi()) { IpsrsPelaksanaanPerbaikanListTeknisi model = new IpsrsPelaksanaanPerbaikanListTeknisi(); - if(CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())){ + if (CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())) { Pegawai ListTeknisi = listModel.getTeknisi(); Pegawai teknisi = new Pegawai(); teknisi.setId(ListTeknisi.getId()); - teknisi.setqPegawai(ListTeknisi.getqPegawai()); + teknisi.setQPegawai(ListTeknisi.getQPegawai()); teknisi.setNamaLengkap(ListTeknisi.getNamaLengkap()); model.setTeknisi(teknisi); } listTeknisi.add(model); } } - - if(CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)){ + + if (CommonUtil.isNotNullOrEmpty(ipsrsPelaksanaanPerbaikan)) { result.put("tglMulaiPeriksa", ipsrsPelaksanaanPerbaikan.getTglMulaiPeriksa()); result.put("analisaTeknisi", ipsrsPelaksanaanPerbaikan.getAnalisaTeknisi()); result.put("analisaKerusakan", ipsrsPelaksanaanPerbaikan.getAnalisaKerusakan()); @@ -438,49 +451,50 @@ public class IpsrsPerbaikanServiceImpl implements IpsrsPerbaikanService{ } return result; } - + @Override - public Boolean deleteIpsrsPerbaikan(String noRec){ + public Boolean deleteIpsrsPerbaikan(String noRec) { IpsrsPerbaikan ipsrsPerbaikan = new IpsrsPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(noRec)){ + if (CommonUtil.isNotNullOrEmpty(noRec)) { ipsrsPerbaikan = ipsrsPerbaikanDao.findOne(noRec); ipsrsPerbaikanDao.delete(ipsrsPerbaikan); return true; - } else{ + } else { return false; } } - + @Override - public Map updatePermintaanPerbaikan(IpsrsPerbaikanVO vo){ + public Map updatePermintaanPerbaikan(IpsrsPerbaikanVO vo) { Map result = new HashMap<>(); IpsrsPerbaikan ipsrsPerbaikan = new IpsrsPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo)){ + if (CommonUtil.isNotNullOrEmpty(vo)) { ipsrsPerbaikan = ipsrsPerbaikanConverter.transferVOToModel(vo, new IpsrsPerbaikan()); ipsrsPerbaikan.setNoOrder(vo.getNoOrder()); } - if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){ - ipsrsPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); + if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) { + ipsrsPerbaikan.setRegistrasiAset( + registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); } - if(CommonUtil.isNotNullOrEmpty(vo.getPelapor())){ + if (CommonUtil.isNotNullOrEmpty(vo.getPelapor())) { ipsrsPerbaikan.setPelapor(pegawaiConverter.transferVOToModel(vo.getPelapor(), new Pegawai())); } - if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) { IpsrsStatusPerbaikan ipsrsStatusPerbaikan = new IpsrsStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())){ - ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter. - transferVOToModel(vo.getIpsrsStatusPerbaikan(), new IpsrsStatusPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(vo.getIpsrsStatusPerbaikan())) { + ipsrsStatusPerbaikan = ipsrsStatusPerbaikanConverter.transferVOToModel(vo.getIpsrsStatusPerbaikan(), + new IpsrsStatusPerbaikan()); ipsrsStatusPerbaikan.setIpsrsPerbaikan(ipsrsPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsStatusPerbaikan)) { ipsrsPerbaikan.setIpsrsStatusPerbaikan(ipsrsStatusPerbaikan); } } - if(CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ipsrsPerbaikan)) { IpsrsPerbaikan resultIpsrsPerbaikan = ipsrsPerbaikanDao.save(ipsrsPerbaikan); result.put("noRec", resultIpsrsPerbaikan.noRec); } return result; } - + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java index c26e34bc..0876bbf4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ItPerbaikanServiceImpl.java @@ -45,182 +45,182 @@ import com.jasamedika.medifirst2000.vo.RuanganVO; import com.jasamedika.medifirst2000.vo.StokProdukGlobalVO; @Service("ItPerbaikanService") -public class ItPerbaikanServiceImpl implements ItPerbaikanService{ +public class ItPerbaikanServiceImpl implements ItPerbaikanService { @Autowired private ItPerbaikanDao itPerbaikanDao; - + @Autowired private StrukOrderDao strukOrderRuanganDao; - + @Autowired private ItStatusPerbaikanDao itStatusPerbaikanDao; - + @Autowired private ItPelaksanaanPerbaikanDao itPelaksanaanPerbaikanDao; @Autowired private RuanganDao ruanganDao; - + @Autowired - private BaseConverterImpl itPerbaikanConverter; - + private BaseConverterImpl itPerbaikanConverter; + @Autowired - private BaseConverterImpl registrasiAsetConverter; - + private BaseConverterImpl registrasiAsetConverter; + @Autowired - private BaseConverterImpl pegawaiConverter; - + private BaseConverterImpl pegawaiConverter; + @Autowired - private BaseConverterImpl itStatusPerbaikanConverter; - + private BaseConverterImpl itStatusPerbaikanConverter; + @Autowired - private BaseConverterImpl itPelaksanaanPerbaikanConverter; - + private BaseConverterImpl itPelaksanaanPerbaikanConverter; + @Autowired - private BaseConverterImpl itPelaksanaanPerbaikanSukuCadangConverter; - + private BaseConverterImpl itPelaksanaanPerbaikanSukuCadangConverter; + @Autowired - private BaseConverterImpl itPelaksanaanPerbaikanListTeknisir; - + private BaseConverterImpl itPelaksanaanPerbaikanListTeknisir; + @Autowired - private BaseConverterImpl stokProdukGlobalConverter; - + private BaseConverterImpl stokProdukGlobalConverter; + @Autowired - private BaseConverterImpl ruanganConverter; - + private BaseConverterImpl ruanganConverter; + @Autowired private LoginUserService loginUserService; - + @Autowired private PegawaiDao pegawaiDao; - + @Autowired private ItPelaksanaanPerbaikanListTeknisiDao itPelaksanaanPerbaikanListTeknisiDao; - + @Autowired private StokProdukGlobalDao stokProdukGlobalDao; - + @Autowired private ItPelaksanaanPerbaikanSukuCadangDao itPelaksanaanPerbaikanSukuCadangDao; - + @Autowired private ItPerbaikanDaoCustom itPerbaikanDaoCustom; - @Override public Map getUserLogin() { - Map result = new HashMap(); + Map result = new HashMap(); Pegawai pegawai = loginUserService.getLoginUser().getPegawai(); - if(CommonUtil.isNotNullOrEmpty(pegawai)){ + if (CommonUtil.isNotNullOrEmpty(pegawai)) { result.put("name", pegawai.getNamaLengkap()); result.put("idPegawai", pegawai.getId()); result.put("idRuangan", pegawai.getRuangan().getId()); } return result; } - + @Override - public Map getNoOrderTable(){ + public Map getNoOrderTable() { Map result = new HashMap<>(); List list = itPerbaikanDao.noOrder(); - - if(CommonUtil.isNotNullOrEmpty(list)){ - Integer data = Integer.parseInt(list.get(list.size()-1).substring(2))+1; - result.put("noOrder", "PR"+data); - } else{ + + if (CommonUtil.isNotNullOrEmpty(list)) { + Integer data = Integer.parseInt(list.get(list.size() - 1).substring(2)) + 1; + result.put("noOrder", "PR" + data); + } else { result.put("noOrder", noOrderPerbaikan()); } return result; } - + @Override public String noOrderPerbaikan() { - Date dateNow=new Date(); - Integer month=DateUtil.getMonthFromDate(dateNow); - Integer year=DateUtil.getYearFromDate(dateNow); - Long count=itPerbaikanDao.count(); - - String monthNow=month.toString(); - String yearNow=year.toString().substring(2, 4); - String noOrder=null; - - count++; - if(count.toString().length()==1){ - noOrder="000";} - else if(count.toString().length()==2){ - noOrder="00";} - else if(count.toString().length()==3){ - noOrder="0";} - if(monthNow.length()==1) - monthNow = "0"+monthNow; + Date dateNow = new Date(); + Integer month = DateUtil.getMonthFromDate(dateNow); + Integer year = DateUtil.getYearFromDate(dateNow); + Long count = itPerbaikanDao.count(); - return "PR"+yearNow+monthNow+noOrder+count; + String monthNow = month.toString(); + String yearNow = year.toString().substring(2, 4); + String noOrder = null; + + count++; + if (count.toString().length() == 1) { + noOrder = "000"; + } else if (count.toString().length() == 2) { + noOrder = "00"; + } else if (count.toString().length() == 3) { + noOrder = "0"; + } + if (monthNow.length() == 1) + monthNow = "0" + monthNow; + + return "PR" + yearNow + monthNow + noOrder + count; } - + @Override - public Map getRuanganPerbaikan(){ + public Map getRuanganPerbaikan() { Map result = new HashMap<>(); List ruanganAset = ruanganDao.getRuanganOnAset(); result.put("ruanganAset", ruanganAset); return result; } - + @Override - public Map getAsetPerbaikan(Integer id){ + public Map getAsetPerbaikan(Integer id) { Map result = new HashMap<>(); List> ItPerbaikan = new ArrayList<>(); List> listPelapor = new ArrayList<>(); - if(CommonUtil.isNotNullOrEmpty(id)){ - for(Map mapping : itPerbaikanDao.getAllRegistrasiByRuangan(id)){ - if(CommonUtil.isNullOrEmpty(mapping.get("noRec"))){ + if (CommonUtil.isNotNullOrEmpty(id)) { + for (Map mapping : itPerbaikanDao.getAllRegistrasiByRuangan(id)) { + if (CommonUtil.isNullOrEmpty(mapping.get("noRec"))) { mapping.put("noRec", "-"); - } - if(CommonUtil.isNullOrEmpty(mapping.get("noSeri"))){ + } + if (CommonUtil.isNullOrEmpty(mapping.get("noSeri"))) { mapping.put("noSeri", "-"); - } - if(CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))){ + } + if (CommonUtil.isNullOrEmpty(mapping.get("kdProduk"))) { mapping.put("kdProduk", "-"); } - if(CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))){ + if (CommonUtil.isNullOrEmpty(mapping.get("namaProduk"))) { mapping.put("namaProduk", "-"); - } - if(CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))){ + } + if (CommonUtil.isNullOrEmpty(mapping.get("merkProduk"))) { mapping.put("merkProduk", "-"); } - if(CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))){ + if (CommonUtil.isNullOrEmpty(mapping.get("typeProduk"))) { mapping.put("typeProduk", "-"); } ItPerbaikan.add(mapping); } listPelapor = itPerbaikanDao.getPegawaiByRuangan(id); } - if(CommonUtil.isNotNullOrEmpty(ItPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) { result.put("dataAset", ItPerbaikan); result.put("pelapor", listPelapor); } return result; } - + @Override - public Map savePermintaanPerbaikan(ItPerbaikanVO vo){ + public Map savePermintaanPerbaikan(ItPerbaikanVO vo) { Map result = new HashMap<>(); - - //Save Perbaikan di StrukOrder + + // Save Perbaikan di StrukOrder StrukOrder strukOrder = new StrukOrder(); strukOrder.setNoOrder(noOrderPerbaikan()); strukOrder.setTglOrder(vo.getTglPesan()); strukOrder.setIsDelivered((byte) 1); - + strukOrder.setKeteranganKeperluan(vo.getKeluhan()); strukOrder.setKeteranganLainnya(vo.getKeluhan()); /* Kategori Kerusakan=Hardware/Software */ - String kategoriKerusakan=""; - if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){ + String kategoriKerusakan = ""; + if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) { kategoriKerusakan = vo.getRegistrasiAset().getKeteranganLainnya(); } - strukOrder.setKeteranganOrder("Permintaan Perbaikan dari ITI "+kategoriKerusakan); - //strukOrder.setRuangan(model.getRegistrasiAset().getRuangan()); + strukOrder.setKeteranganOrder("Permintaan Perbaikan dari ITI " + kategoriKerusakan); + // strukOrder.setRuangan(model.getRegistrasiAset().getRuangan()); Ruangan ruangan = this.ruanganDao.findById(vo.getRuanganId()); strukOrder.setRuangan(ruangan); Pegawai pelapor = this.pegawaiDao.findById(vo.getPelaporId()); @@ -238,48 +238,50 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ strukOrder = strukOrderRuanganDao.save(strukOrder); ItPerbaikan itPerbaikan = new ItPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo)){ + if (CommonUtil.isNotNullOrEmpty(vo)) { itPerbaikan = itPerbaikanConverter.transferVOToModel(vo, new ItPerbaikan()); itPerbaikan.setNoOrder(noOrderPerbaikan()); } - if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){ - if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset().getNoRec())) - itPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); + if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) { + if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset().getNoRec())) + itPerbaikan.setRegistrasiAset( + registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); } - + itPerbaikan.setStrukOrder(strukOrder); itPerbaikan.setPelapor(pelapor); itPerbaikan.setTglPesan(new Date()); ItPerbaikan model = itPerbaikanDao.save(itPerbaikan); - - //Save Status Perbaikan - if(CommonUtil.isNotNullOrEmpty(itPerbaikan)){ + + // Save Status Perbaikan + if (CommonUtil.isNotNullOrEmpty(itPerbaikan)) { ItStatusPerbaikan ItStatusPerbaikan = new ItStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())){ - ItStatusPerbaikan = itStatusPerbaikanConverter.transferVOToModel(vo.getItStatusPerbaikan(), new ItStatusPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())) { + ItStatusPerbaikan = itStatusPerbaikanConverter.transferVOToModel(vo.getItStatusPerbaikan(), + new ItStatusPerbaikan()); ItStatusPerbaikan.setStatusPengerjaan(0); ItStatusPerbaikan.setItPerbaikan(itPerbaikan); } ItStatusPerbaikan = this.itStatusPerbaikanDao.save(ItStatusPerbaikan); } - result.put("noRec",model.getNoRec()); - + result.put("noRec", model.getNoRec()); + return result; - + } @Override public Map getAllPermintaanPerbaikan(Integer page, Integer limit, String sort, String dir, - String tanggalAwal,String tanggalAkhir, - Integer ruanganId,Integer statusPekerjaan) { + String tanggalAwal, String tanggalAkhir, Integer ruanganId, Integer statusPekerjaan) { - if(!CommonUtil.isNotNullOrEmpty(tanggalAwal) && !CommonUtil.isNotNullOrEmpty(tanggalAkhir)){ - tanggalAwal="1900-01-01"; - tanggalAkhir="2100-10-10"; + if (!CommonUtil.isNotNullOrEmpty(tanggalAwal) && !CommonUtil.isNotNullOrEmpty(tanggalAkhir)) { + tanggalAwal = "1900-01-01"; + tanggalAkhir = "2100-10-10"; } - int totalRow = itPerbaikanDaoCustom.getCountPermintaanPerbaikanRev1(tanggalAwal,tanggalAkhir,ruanganId,statusPekerjaan); + int totalRow = itPerbaikanDaoCustom.getCountPermintaanPerbaikanRev1(tanggalAwal, tanggalAkhir, ruanganId, + statusPekerjaan); int totalPages = 0; int pageRequested = page; @@ -297,135 +299,140 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ rowStart = 0; } int rowEnd = limit; - - Map result=new HashMap(); - result.put("data", itPerbaikanDaoCustom.getAllPermintaanPerbaikanRev1(rowStart, rowEnd, sort, dir,tanggalAwal,tanggalAkhir, - ruanganId,statusPekerjaan)); + + Map result = new HashMap(); + result.put("data", itPerbaikanDaoCustom.getAllPermintaanPerbaikanRev1(rowStart, rowEnd, sort, dir, tanggalAwal, + tanggalAkhir, ruanganId, statusPekerjaan)); result.put("totalPages", totalPages); result.put("totalRow", totalRow); - return result; + return result; } - + @Override public Map getPermintaanPerbaikanByRuanganId(Integer ruanganId) { Map result = new HashMap<>(); String param = ""; - //untuk semua permintaan tetap ditampilkan semua, - //di kolom perbaikan, ada status perbaikan - //update by iwankasan - //date : 13.04.2018 - List> listPermintaanPerbaikan = - itPerbaikanDao.getPermintaanPerbaikanByRuanganId(ruanganId); - - - if(CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)){ + // untuk semua permintaan tetap ditampilkan semua, + // di kolom perbaikan, ada status perbaikan + // update by iwankasan + // date : 13.04.2018 + List> listPermintaanPerbaikan = itPerbaikanDao.getPermintaanPerbaikanByRuanganId(ruanganId); + + if (CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)) { result.put("listPermintaanPerbaikan", listPermintaanPerbaikan); - } + } return result; } - + @Override - public Map getOnePermintaanPerbaikan(String noRec){ + public Map getOnePermintaanPerbaikan(String noRec) { Map result = new HashMap<>(); ItPerbaikan ItPerbaikan = itPerbaikanDao.findOne(noRec); - - if(CommonUtil.isNotNullOrEmpty(noRec)){ + + if (CommonUtil.isNotNullOrEmpty(noRec)) { Map permintaanPerbaikan = itPerbaikanDao.getOnePermintaanPerbaikan(noRec); - List> aset = itPerbaikanDao.getAllRegistrasiByNoRec((String)permintaanPerbaikan.get("noRecAsset")); + List> aset = itPerbaikanDao + .getAllRegistrasiByNoRec((String) permintaanPerbaikan.get("noRecAsset")); List> listUser = itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanByNoRec(noRec); List> listTeknisi = itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan(noRec); - List> listSukuCadang = itPerbaikanDao.getSukuCadang(); - if(CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)){ + List> listSukuCadang = itPerbaikanDao.getSukuCadang(); + if (CommonUtil.isNotNullOrEmpty(permintaanPerbaikan)) { result.put("aset", aset); result.put("permintaanPerbaikan", permintaanPerbaikan); result.put("sukuCadang", listSukuCadang); result.put("listTeknisi", listTeknisi); - } + } } return result; } - + @Override - public Map savePelaksanaanPerbaikan(ItPelaksanaanPerbaikanVO vo){ - Map result = new HashMap<>(); + public Map savePelaksanaanPerbaikan(ItPelaksanaanPerbaikanVO vo) { + Map result = new HashMap<>(); ItPerbaikan ItPerbaikan = itPerbaikanDao.findByNoRec(vo.getNoRecItPerbaikan()); - - if(CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())){ + + if (CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())) { ItStatusPerbaikan ItStatusPerbaikan = ItPerbaikan.getItStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())) { ItStatusPerbaikan.setStatusPengerjaan(vo.getStatusPengerjaan()); } - if(CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())){ + if (CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())) { ItStatusPerbaikan.setKetStatusRespon(vo.getKetStatusRespon()); } - if(CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)) { itStatusPerbaikanDao.save(ItStatusPerbaikan); } } - if(CommonUtil.isNullOrEmpty(ItPerbaikan.getItPelaksanaanPerbaikan())){ + if (CommonUtil.isNullOrEmpty(ItPerbaikan.getItPelaksanaanPerbaikan())) { ItPelaksanaanPerbaikan ItPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo)){ - ItPelaksanaanPerbaikan = itPelaksanaanPerbaikanConverter.transferVOToModel(vo, new ItPelaksanaanPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(vo)) { + ItPelaksanaanPerbaikan = itPelaksanaanPerbaikanConverter.transferVOToModel(vo, + new ItPelaksanaanPerbaikan()); ItPelaksanaanPerbaikan.setItPerbaikan(ItPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(vo.getUser())){ + if (CommonUtil.isNotNullOrEmpty(vo.getUser())) { ItPelaksanaanPerbaikan.setUser(pegawaiConverter.transferVOToModel(vo.getUser(), new Pegawai())); } - if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)) { ItPerbaikan.setItPelaksanaanPerbaikan(ItPelaksanaanPerbaikan); } - + Set listSukuCadang = new HashSet<>(); - if(CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanSukuCadang())){ - for(ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()){ + if (CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanSukuCadang())) { + for (ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()) { ItPelaksanaanPerbaikanSukuCadang ItPelaksanaanPerbaikanTambahBarang = new ItPelaksanaanPerbaikanSukuCadang(); - if(CommonUtil.isNotNullOrEmpty(modelBarangVO)){ - ItPelaksanaanPerbaikanTambahBarang = itPelaksanaanPerbaikanSukuCadangConverter.transferVOToModel(modelBarangVO, new ItPelaksanaanPerbaikanSukuCadang()); + if (CommonUtil.isNotNullOrEmpty(modelBarangVO)) { + ItPelaksanaanPerbaikanTambahBarang = itPelaksanaanPerbaikanSukuCadangConverter + .transferVOToModel(modelBarangVO, new ItPelaksanaanPerbaikanSukuCadang()); ItPelaksanaanPerbaikanTambahBarang.setItPelaksanaanPerbaikan(ItPelaksanaanPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())){ - ItPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter.transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal())); + if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getStokProdukGlobal())) { + ItPelaksanaanPerbaikanTambahBarang.setStokProdukGlobal(stokProdukGlobalConverter + .transferVOToModel(modelBarangVO.getStokProdukGlobal(), new StokProdukGlobal())); } - if(CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())){ - ItPelaksanaanPerbaikanTambahBarang.setTujuanRuangan(ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan())); + if (CommonUtil.isNotNullOrEmpty(modelBarangVO.getTujuanRuangan())) { + ItPelaksanaanPerbaikanTambahBarang.setTujuanRuangan( + ruanganConverter.transferVOToModel(modelBarangVO.getTujuanRuangan(), new Ruangan())); } listSukuCadang.add(ItPelaksanaanPerbaikanTambahBarang); } ItPelaksanaanPerbaikan.setItPelaksanaanPerbaikanSukuCadang(listSukuCadang); } - + Set listTeknisi = new HashSet<>(); - if(CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanListTeknisi())){ - for(ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()){ + if (CommonUtil.isNotNullOrEmpty(vo.getItPelaksanaanPerbaikanListTeknisi())) { + for (ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()) { ItPelaksanaanPerbaikanListTeknisi ItPelaksanaanPerbaikanListTeknisi = new ItPelaksanaanPerbaikanListTeknisi(); - if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO)){ - ItPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisir.transferVOToModel(modelTeknisiVO, new ItPelaksanaanPerbaikanListTeknisi()); + if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO)) { + ItPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisir + .transferVOToModel(modelTeknisiVO, new ItPelaksanaanPerbaikanListTeknisi()); ItPelaksanaanPerbaikanListTeknisi.setItPelaksanaanPerbaikan(ItPelaksanaanPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())){ - ItPelaksanaanPerbaikanListTeknisi.setTeknisi(pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai())); + if (CommonUtil.isNotNullOrEmpty(modelTeknisiVO.getTeknisi())) { + ItPelaksanaanPerbaikanListTeknisi.setTeknisi( + pegawaiConverter.transferVOToModel(modelTeknisiVO.getTeknisi(), new Pegawai())); } listTeknisi.add(ItPelaksanaanPerbaikanListTeknisi); } ItPelaksanaanPerbaikan.setItPelaksanaanPerbaikanListTeknisi(listTeknisi); } - - if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)){ + + if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)) { ItPelaksanaanPerbaikan model = itPelaksanaanPerbaikanDao.save(ItPelaksanaanPerbaikan); - if(CommonUtil.isNotNullOrEmpty(model)){ + if (CommonUtil.isNotNullOrEmpty(model)) { StrukOrder strukOrder = new StrukOrder(); strukOrder.setNoOrder(""); strukOrder.setTglOrder(model.getTglMulaiPeriksa()); strukOrder.setIsDelivered((byte) 1); - + strukOrder.setKeteranganKeperluan(model.getAnalisaTeknisi()); strukOrder.setKeteranganLainnya(model.getAnalisaKerusakan()); strukOrder.setKeteranganOrder("Permintaan suku cadang perbaikan dari ITI"); strukOrder.setRuangan(model.getItPerbaikan().getRegistrasiAset().getRuangan()); strukOrder.setPegawaiOrder(model.getUser()); - + strukOrder.setQtyJenisProduk(0.00); strukOrder.setQtyProduk(0.00); strukOrder.setTotalBeaMaterai(0.00); @@ -437,45 +444,47 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ strukOrder.setTotalPph(0.00); strukOrder.setTotalPpn(0.00); strukOrderRuanganDao.save(strukOrder); - } + } result.put("noRec", model.getNoRec()); } - + } - + return result; } - + @Override - public Map getAllItPerbaikanByNoRec(String noRec){ + public Map getAllItPerbaikanByNoRec(String noRec) { Map result = new HashMap<>(); ItPelaksanaanPerbaikan ItPelaksanaanPerbaikan = itPerbaikanDao.getAllItPerbaikanByNoRec(noRec); List listBarang = new ArrayList<>(); - if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanSukuCadang())){ - for(ItPelaksanaanPerbaikanSukuCadang listModel : ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanSukuCadang()){ - if(CommonUtil.isNotNullOrEmpty(listModel)){ + if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanSukuCadang())) { + for (ItPelaksanaanPerbaikanSukuCadang listModel : ItPelaksanaanPerbaikan + .getItPelaksanaanPerbaikanSukuCadang()) { + if (CommonUtil.isNotNullOrEmpty(listModel)) { listBarang.add(listModel); } } } - + List listTeknisi = new ArrayList<>(); - if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanListTeknisi())){ - for(ItPelaksanaanPerbaikanListTeknisi listModel : ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanListTeknisi()){ + if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan.getItPelaksanaanPerbaikanListTeknisi())) { + for (ItPelaksanaanPerbaikanListTeknisi listModel : ItPelaksanaanPerbaikan + .getItPelaksanaanPerbaikanListTeknisi()) { ItPelaksanaanPerbaikanListTeknisi model = new ItPelaksanaanPerbaikanListTeknisi(); - if(CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())){ + if (CommonUtil.isNotNullOrEmpty(listModel.getTeknisi())) { Pegawai ListTeknisi = listModel.getTeknisi(); Pegawai teknisi = new Pegawai(); teknisi.setId(ListTeknisi.getId()); - teknisi.setqPegawai(ListTeknisi.getqPegawai()); + teknisi.setQPegawai(ListTeknisi.getQPegawai()); teknisi.setNamaLengkap(ListTeknisi.getNamaLengkap()); model.setTeknisi(teknisi); } listTeknisi.add(model); } } - - if(CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)){ + + if (CommonUtil.isNotNullOrEmpty(ItPelaksanaanPerbaikan)) { result.put("tglMulaiPeriksa", ItPelaksanaanPerbaikan.getTglMulaiPeriksa()); result.put("analisaTeknisi", ItPelaksanaanPerbaikan.getAnalisaTeknisi()); result.put("analisaKerusakan", ItPelaksanaanPerbaikan.getAnalisaKerusakan()); @@ -484,54 +493,55 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ } return result; } - + @Override - public Boolean deleteItPerbaikan(String noRec){ + public Boolean deleteItPerbaikan(String noRec) { ItPerbaikan ItPerbaikan = new ItPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(noRec)){ + if (CommonUtil.isNotNullOrEmpty(noRec)) { ItPerbaikan = itPerbaikanDao.findOne(noRec); - if(CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())){ - if(ItPerbaikan.getItStatusPerbaikan().getStatusPengerjaan()==0){ + if (CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())) { + if (ItPerbaikan.getItStatusPerbaikan().getStatusPengerjaan() == 0) { ItStatusPerbaikan ItStatusPerbaikan = ItPerbaikan.getItStatusPerbaikan(); ItStatusPerbaikan.setStatusPengerjaan(2); ItPerbaikan.setItStatusPerbaikan(ItStatusPerbaikan); itPerbaikanDao.save(ItPerbaikan); - } + } } -// ItPerbaikan.setStatusEnabled(false); -// itPerbaikanDao.save(ItPerbaikan); + // ItPerbaikan.setStatusEnabled(false); + // itPerbaikanDao.save(ItPerbaikan); return true; - } else{ + } else { return false; } } - + @Override - public Map updatePermintaanPerbaikan(ItPerbaikanVO vo){ + public Map updatePermintaanPerbaikan(ItPerbaikanVO vo) { Map result = new HashMap<>(); ItPerbaikan ItPerbaikan = new ItPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo)){ + if (CommonUtil.isNotNullOrEmpty(vo)) { ItPerbaikan = itPerbaikanConverter.transferVOToModel(vo, new ItPerbaikan()); ItPerbaikan.setNoOrder(vo.getNoOrder()); } - if(CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())){ - ItPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); + if (CommonUtil.isNotNullOrEmpty(vo.getRegistrasiAset())) { + ItPerbaikan.setRegistrasiAset( + registrasiAsetConverter.transferVOToModel(vo.getRegistrasiAset(), new RegistrasiAset())); } - if(CommonUtil.isNotNullOrEmpty(vo.getPelapor())){ + if (CommonUtil.isNotNullOrEmpty(vo.getPelapor())) { ItPerbaikan.setPelapor(pegawaiConverter.transferVOToModel(vo.getPelapor(), new Pegawai())); } - if(CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())) { ItStatusPerbaikan ItStatusPerbaikan = new ItStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())){ - ItStatusPerbaikan = itStatusPerbaikanConverter. - transferVOToModel(vo.getItStatusPerbaikan(), new ItStatusPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(vo.getItStatusPerbaikan())) { + ItStatusPerbaikan = itStatusPerbaikanConverter.transferVOToModel(vo.getItStatusPerbaikan(), + new ItStatusPerbaikan()); ItStatusPerbaikan.setItPerbaikan(ItPerbaikan); } - if(CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ItStatusPerbaikan)) { ItPerbaikan.setItStatusPerbaikan(ItStatusPerbaikan); } } - if(CommonUtil.isNotNullOrEmpty(ItPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) { ItPerbaikan resultItPerbaikan = itPerbaikanDao.save(ItPerbaikan); result.put("noRec", resultItPerbaikan.noRec); } @@ -541,11 +551,13 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ @Override public Map savePelaksanaanPerbaikanRev1(ItPelaksanaanPerbaikanVO vo) { Map result = new HashMap<>(); - - ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao.getByItPerbaikan(vo.getNoRecItPerbaikan()); - if(CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikan)){ + + ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao + .getByItPerbaikan(vo.getNoRecItPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikan)) { itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao.findOne(itPelaksanaanPerbaikan.getNoRec()); - }else itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan(); + } else + itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan(); ItPerbaikan itPerbaikan = itPerbaikanDao.findOne(vo.getNoRecItPerbaikan()); itPelaksanaanPerbaikan.setItPerbaikan(itPerbaikan); itPelaksanaanPerbaikan.setTglMulaiPeriksa(vo.getTglMulaiPeriksa()); @@ -555,70 +567,78 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ itPelaksanaanPerbaikan.setJenisPekerjaan(vo.getJenisPekerjaan()); Pegawai user = this.pegawaiDao.findById(vo.getUserId()); itPelaksanaanPerbaikan.setUser(user); - - ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao.save(itPelaksanaanPerbaikan); - if(itPelaksanaanPerbaikanResult.getNoRec() !=null){ + + ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao + .save(itPelaksanaanPerbaikan); + if (itPelaksanaanPerbaikanResult.getNoRec() != null) { result.put("data", itPelaksanaanPerbaikanResult.getNoRec()); } - - //list teknisi - //desable it pelaksana semua - List itPelaksanaanPerbaikanListTeknisiList = itPelaksanaanPerbaikanListTeknisiDao.getTeknisiByPerbaikan(vo.getNoRecItPerbaikan()); - if(CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikanListTeknisiList)){ - for(ItPelaksanaanPerbaikanListTeknisi modelTeknisi : itPelaksanaanPerbaikanListTeknisiList){ - ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao.findOne(modelTeknisi.getNoRec()); + + // list teknisi + // desable it pelaksana semua + List itPelaksanaanPerbaikanListTeknisiList = itPelaksanaanPerbaikanListTeknisiDao + .getTeknisiByPerbaikan(vo.getNoRecItPerbaikan()); + if (CommonUtil.isNotNullOrEmpty(itPelaksanaanPerbaikanListTeknisiList)) { + for (ItPelaksanaanPerbaikanListTeknisi modelTeknisi : itPelaksanaanPerbaikanListTeknisiList) { + ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao + .findOne(modelTeknisi.getNoRec()); itPelaksanaanPerbaikanListTeknisi.setStatusEnabled(false); itPelaksanaanPerbaikanListTeknisiDao.save(itPelaksanaanPerbaikanListTeknisi); } } - - if(itPelaksanaanPerbaikanResult.getNoRec() !=null){ - for(ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()){ + + if (itPelaksanaanPerbaikanResult.getNoRec() != null) { + for (ItPelaksanaanPerbaikanListTeknisiVO modelTeknisiVO : vo.getItPelaksanaanPerbaikanListTeknisi()) { ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = new ItPelaksanaanPerbaikanListTeknisi(); - ItPelaksanaanPerbaikanListTeknisi cekTeknisi = itPelaksanaanPerbaikanListTeknisiDao.getTeknisiByTeknisiId(vo.getNoRecItPerbaikan(), modelTeknisiVO.getTeknisiId()); - if(CommonUtil.isNotNullOrEmpty(cekTeknisi)){ - itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao.findOne(cekTeknisi.getNoRec()); + ItPelaksanaanPerbaikanListTeknisi cekTeknisi = itPelaksanaanPerbaikanListTeknisiDao + .getTeknisiByTeknisiId(vo.getNoRecItPerbaikan(), modelTeknisiVO.getTeknisiId()); + if (CommonUtil.isNotNullOrEmpty(cekTeknisi)) { + itPelaksanaanPerbaikanListTeknisi = itPelaksanaanPerbaikanListTeknisiDao + .findOne(cekTeknisi.getNoRec()); itPelaksanaanPerbaikanListTeknisi.setNoRec(cekTeknisi.getNoRec()); itPelaksanaanPerbaikanListTeknisi.setStatusEnabled(true); - }else{ + } else { itPelaksanaanPerbaikanListTeknisi.setItPelaksanaanPerbaikan(itPelaksanaanPerbaikanResult); Pegawai teknisi = this.pegawaiDao.findById(modelTeknisiVO.getTeknisiId()); itPelaksanaanPerbaikanListTeknisi.setTeknisi(teknisi); itPelaksanaanPerbaikanListTeknisi.setStatusEnabled(modelTeknisiVO.getStatusEnabled()); } - itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao.save(itPelaksanaanPerbaikanListTeknisi); + itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao + .save(itPelaksanaanPerbaikanListTeknisi); } } - - //list sparepart/sukucadang yang digunakan - if(vo.getItPelaksanaanPerbaikanSukuCadang() !=null && itPelaksanaanPerbaikanResult.getNoRec() !=null){ - for(ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()){ + + // list sparepart/sukucadang yang digunakan + if (vo.getItPelaksanaanPerbaikanSukuCadang() != null && itPelaksanaanPerbaikanResult.getNoRec() != null) { + for (ItPelaksanaanPerbaikanSukuCadangVO modelBarangVO : vo.getItPelaksanaanPerbaikanSukuCadang()) { ItPelaksanaanPerbaikanSukuCadang itPelaksanaanPerbaikanSukuCadang = new ItPelaksanaanPerbaikanSukuCadang(); itPelaksanaanPerbaikanSukuCadang.setItPelaksanaanPerbaikan(itPelaksanaanPerbaikanResult); - StokProdukGlobal stockProdukGlobal = this.stokProdukGlobalDao.findOne(modelBarangVO.getStokProdukGlobalId()); + StokProdukGlobal stockProdukGlobal = this.stokProdukGlobalDao + .findOne(modelBarangVO.getStokProdukGlobalId()); itPelaksanaanPerbaikanSukuCadang.setStokProdukGlobal(stockProdukGlobal); Ruangan ruangTujuan = this.ruanganDao.findById(modelBarangVO.getRuanganTujuanId()); itPelaksanaanPerbaikanSukuCadang.setTujuanRuangan(ruangTujuan); itPelaksanaanPerbaikanSukuCadang.setQty(modelBarangVO.getQty()); itPelaksanaanPerbaikanSukuCadang.setStatusEnabled(modelBarangVO.getStatusEnabled()); - itPelaksanaanPerbaikanSukuCadang = this.itPelaksanaanPerbaikanSukuCadangDao.save(itPelaksanaanPerbaikanSukuCadang); + itPelaksanaanPerbaikanSukuCadang = this.itPelaksanaanPerbaikanSukuCadangDao + .save(itPelaksanaanPerbaikanSukuCadang); } } - - //buat strukorder - if(itPelaksanaanPerbaikanResult.getNoRec() !=null){ + + // buat strukorder + if (itPelaksanaanPerbaikanResult.getNoRec() != null) { StrukOrder strukOrder = new StrukOrder(); strukOrder.setNoOrder(""); strukOrder.setTglOrder(vo.getTglMulaiPeriksa()); strukOrder.setIsDelivered((byte) 1); - + strukOrder.setKeteranganKeperluan(vo.getAnalisaTeknisi()); strukOrder.setKeteranganLainnya(vo.getAnalisaKerusakan()); strukOrder.setKeteranganOrder("Permintaan suku cadang perbaikan dari ITI"); Ruangan ruangan = this.ruanganDao.findById(vo.getRuangan()); strukOrder.setRuangan(ruangan); strukOrder.setPegawaiOrder(user); - + strukOrder.setQtyJenisProduk(0.00); strukOrder.setQtyProduk(0.00); strukOrder.setTotalBeaMaterai(0.00); @@ -630,29 +650,30 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ strukOrder.setTotalPph(0.00); strukOrder.setTotalPpn(0.00); strukOrderRuanganDao.save(strukOrder); - + } - - //update registrasi asset - if(CommonUtil.isNotNullOrEmpty(vo.getItPerbaikan().getRegistrasiAset())){ - itPerbaikan.setRegistrasiAset(registrasiAsetConverter.transferVOToModel(vo.getItPerbaikan().getRegistrasiAset(), new RegistrasiAset())); + + // update registrasi asset + if (CommonUtil.isNotNullOrEmpty(vo.getItPerbaikan().getRegistrasiAset())) { + itPerbaikan.setRegistrasiAset(registrasiAsetConverter + .transferVOToModel(vo.getItPerbaikan().getRegistrasiAset(), new RegistrasiAset())); itPerbaikanDao.save(itPerbaikan); } - - //update statusperbaikan - if(CommonUtil.isNotNullOrEmpty(itPerbaikan.getItStatusPerbaikan())){ + + // update statusperbaikan + if (CommonUtil.isNotNullOrEmpty(itPerbaikan.getItStatusPerbaikan())) { ItStatusPerbaikan itStatusPerbaikan = itPerbaikan.getItStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getStatusPengerjaan())) { itStatusPerbaikan.setStatusPengerjaan(vo.getStatusPengerjaan()); } - if(CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())){ + if (CommonUtil.isNotNullOrEmpty(vo.getKetStatusRespon())) { itStatusPerbaikan.setKetStatusRespon(vo.getKetStatusRespon()); } - if(CommonUtil.isNotNullOrEmpty(itStatusPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(itStatusPerbaikan)) { itStatusPerbaikanDao.save(itStatusPerbaikan); } } - + return result; } @@ -660,14 +681,17 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ public Map getPelaksanaanPerbaikIt(String startDate, String endDate) { Map result = new HashMap<>(); List> list = new ArrayList<>(); - - List> listPerbaikan = this.itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanAll(startDate,endDate); - for(Map item:listPerbaikan){ - item.put("statusPerbaikan", this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String)item.get("noRec"))); - item.put("teknisiPerbaikan", this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String)item.get("noRec"))); - item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String)item.get("noRec"))); + + List> listPerbaikan = this.itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanAll(startDate, + endDate); + for (Map item : listPerbaikan) { + item.put("statusPerbaikan", + this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String) item.get("noRec"))); + item.put("teknisiPerbaikan", + this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String) item.get("noRec"))); + item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String) item.get("noRec"))); list.add(item); - + } result.put("data", list); return result; @@ -677,61 +701,61 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ public Map getPelaksanaanPerbaikItByNoRec(String noRec) { Map result = new HashMap<>(); List> list = new ArrayList<>(); - + List> listPerbaikan = this.itPelaksanaanPerbaikanDao.getPelaksanaanPerbaikanByNoRec(noRec); - for(Mapitem:listPerbaikan){ - item.put("statusPerbaikan", this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String)item.get("noRec"))); - item.put("teknisiPerbaikan", this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String)item.get("noRec"))); - item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String)item.get("noRec"))); + for (Map item : listPerbaikan) { + item.put("statusPerbaikan", + this.itPelaksanaanPerbaikanDao.getStatusPerbaikanByPerbaikan((String) item.get("noRec"))); + item.put("teknisiPerbaikan", + this.itPelaksanaanPerbaikanDao.getTeknisiByPerbaikan((String) item.get("noRec"))); + item.put("sukuCadang", this.itPelaksanaanPerbaikanDao.getSukuCadang((String) item.get("noRec"))); list.add(item); } result.put("data", list); return result; } - - + @Override public Map getKategoriKerusakan() { Map result = new HashMap<>(); List> listKategoriKerusakan = this.itPerbaikanDao.getKategoriKerusakan(); - + result.put("data", listKategoriKerusakan); return result; } - + @Override - public Map getAssetByKelompokProduk(Integer id){ + public Map getAssetByKelompokProduk(Integer id) { Map result = new HashMap<>(); List> listAssetByKelompokProduk = this.itPerbaikanDao.getAssetByKelompokProduk(id); - + result.put("data", listAssetByKelompokProduk); return result; } - - + @Override - public Map updateStatusRespon(String noRec,Integer userId){ + public Map updateStatusRespon(String noRec, Integer userId) { Map result = new HashMap<>(); ItPerbaikan ItPerbaikan = itPerbaikanDao.findOne(noRec); - if(CommonUtil.isNotNullOrEmpty(ItPerbaikan)){ + if (CommonUtil.isNotNullOrEmpty(ItPerbaikan)) { ItStatusPerbaikan ItStatusPerbaikan = ItPerbaikan.getItStatusPerbaikan(); - if(CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())){ + if (CommonUtil.isNotNullOrEmpty(ItPerbaikan.getItStatusPerbaikan())) { Long dateTime = Math.abs(DateUtil.now().getTime() - ItPerbaikan.getTglPesan().getTime()); long inMinute = dateTime / 60000; ItStatusPerbaikan.setStatusRespon(1); ItStatusPerbaikan.setKetStatusRespon("Sudah di Respon"); result.put("noRec", ItPerbaikan.noRec); - if(inMinute<15){ + if (inMinute < 15) { ItStatusPerbaikan.setStatusRespon(1); ItStatusPerbaikan.setWaktuRespon(inMinute); ItStatusPerbaikan.setKetStatusRespon("Respon kurang dari 15 menit"); itStatusPerbaikanDao.save(ItStatusPerbaikan); - } else if(inMinute>=15 && inMinute<=30){ + } else if (inMinute >= 15 && inMinute <= 30) { ItStatusPerbaikan.setStatusRespon(2); ItStatusPerbaikan.setWaktuRespon(inMinute); ItStatusPerbaikan.setKetStatusRespon("Respon lebih dari 15 menit, kurang dari 30 menit"); itStatusPerbaikanDao.save(ItStatusPerbaikan); - } else if(inMinute>30){ + } else if (inMinute > 30) { ItStatusPerbaikan.setStatusRespon(3); ItStatusPerbaikan.setWaktuRespon(inMinute); ItStatusPerbaikan.setKetStatusRespon("Respon lebih dari 30 menit"); @@ -739,58 +763,62 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ } } } - + ItPelaksanaanPerbaikanListTeknisi itPelaksanaanPerbaikanListTeknisi = new ItPelaksanaanPerbaikanListTeknisi(); - if(CommonUtil.isNotNullOrEmpty(userId)){ - ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao.getByItPerbaikan(ItPerbaikan.getNoRec()); - if(CommonUtil.isNullOrEmpty(itPelaksanaanPerbaikan)){ - itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan(); + if (CommonUtil.isNotNullOrEmpty(userId)) { + ItPelaksanaanPerbaikan itPelaksanaanPerbaikan = itPelaksanaanPerbaikanDao + .getByItPerbaikan(ItPerbaikan.getNoRec()); + if (CommonUtil.isNullOrEmpty(itPelaksanaanPerbaikan)) { + itPelaksanaanPerbaikan = new ItPelaksanaanPerbaikan(); itPelaksanaanPerbaikan.setItPerbaikan(ItPerbaikan); Pegawai teknisi = this.pegawaiDao.findById(userId); itPelaksanaanPerbaikan.setUser(teknisi); - ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao.save(itPelaksanaanPerbaikan); - + ItPelaksanaanPerbaikan itPelaksanaanPerbaikanResult = this.itPelaksanaanPerbaikanDao + .save(itPelaksanaanPerbaikan); + itPelaksanaanPerbaikanListTeknisi.setItPelaksanaanPerbaikan(itPelaksanaanPerbaikanResult); itPelaksanaanPerbaikanListTeknisi.setTeknisi(teknisi); - itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao.save(itPelaksanaanPerbaikanListTeknisi); + itPelaksanaanPerbaikanListTeknisi = this.itPelaksanaanPerbaikanListTeknisiDao + .save(itPelaksanaanPerbaikanListTeknisi); } - + } return result; } - - + @Override - public Map getNotifikasiItPerbaikan(){ + public Map getNotifikasiItPerbaikan() { Map result = new HashMap<>(); List> notifikasRequest = itPerbaikanDao.getNotifikasRequestiItPerbaikan(); List> notifikasRespon = itPerbaikanDao.getNotifikasResponItPerbaikan(); - + result.put("notifikasRequest", notifikasRequest); result.put("notifikasRespon", notifikasRespon); - + return result; } - + @Override - public Map getLaporanPerbaikanIT(String startDate,String endDate,Integer ruanganId,Integer statusPekerjaan) { + public Map getLaporanPerbaikanIT(String startDate, String endDate, Integer ruanganId, + Integer statusPekerjaan) { Map result = new HashMap<>(); - - List> listPermintaanPerbaikan = - itPerbaikanDaoCustom.getLaporanPerbaikanIT(startDate,endDate,ruanganId,statusPekerjaan); + + List> listPermintaanPerbaikan = itPerbaikanDaoCustom.getLaporanPerbaikanIT(startDate, + endDate, ruanganId, statusPekerjaan); List> resutMapping = new ArrayList(); - for(Map mapping : listPermintaanPerbaikan){ - if(CommonUtil.isNotNullOrEmpty(mapping.get("tglPesan"))){ - mapping.put("tglPesan", DateUtil.formatDate((Date)mapping.get("tglPesan"),"dd-MM-yyyy")); + for (Map mapping : listPermintaanPerbaikan) { + if (CommonUtil.isNotNullOrEmpty(mapping.get("tglPesan"))) { + mapping.put("tglPesan", DateUtil.formatDate((Date) mapping.get("tglPesan"), "dd-MM-yyyy")); } - if(CommonUtil.isNotNullOrEmpty(mapping.get("tglMulaiPeriksa"))){ - mapping.put("tglMulaiPeriksa", DateUtil.formatDate((Date)mapping.get("tglMulaiPeriksa"),"dd-MM-yyyy")); + if (CommonUtil.isNotNullOrEmpty(mapping.get("tglMulaiPeriksa"))) { + mapping.put("tglMulaiPeriksa", + DateUtil.formatDate((Date) mapping.get("tglMulaiPeriksa"), "dd-MM-yyyy")); } - if(CommonUtil.isNotNullOrEmpty(mapping.get("waktuRespon"))){ - mapping.put("waktuRespon", (Long)mapping.get("waktuRespon")+" Menit"); + if (CommonUtil.isNotNullOrEmpty(mapping.get("waktuRespon"))) { + mapping.put("waktuRespon", (Long) mapping.get("waktuRespon") + " Menit"); } - if(CommonUtil.isNotNullOrEmpty(mapping.get("statusPengerjaan"))){ - switch ((Integer)mapping.get("statusPengerjaan")) { + if (CommonUtil.isNotNullOrEmpty(mapping.get("statusPengerjaan"))) { + switch ((Integer) mapping.get("statusPengerjaan")) { case 1: result.put("statusPekerjaan", "Selesai"); mapping.put("statusPengerjaan", "Selesai"); @@ -808,20 +836,19 @@ public class ItPerbaikanServiceImpl implements ItPerbaikanService{ mapping.put("statusPengerjaan", "Belum Dikerjakan"); break; } - }else{ + } else { mapping.put("statusPengerjaan", ""); } - + resutMapping.add(mapping); } String tglCetak = DateUtil.getIndonesianStringDate(new Date()); result.put("tglCetak", tglCetak); - - if(CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)){ + + if (CommonUtil.isNotNullOrEmpty(listPermintaanPerbaikan)) { result.put("listPermintaanPerbaikan", resutMapping); - } + } return result; } - - + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index 08b69015..9823c5fd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -1552,8 +1552,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Pegawai resultDomain = pegawaiDao.save(model); if (CommonUtil.isNotNullOrEmpty(resultDomain)) { - if (CommonUtil.isNotNullOrEmpty(resultDomain.getqPegawai())) { - resultDomain.setqPegawai(resultDomain.getId().shortValue()); + if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) { + resultDomain.setQPegawai(resultDomain.getId().shortValue()); pegawaiDao.save(resultDomain); } result.put("noRec", resultDomain.getId()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java index debb5413..c2876ba8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java @@ -67,6 +67,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh @Autowired private PegawaiDao pegawaiDao; + @Autowired private KelompokTransaksiDao kelompokTransaksiDao; @@ -468,7 +469,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh jenisPetugasPelaksana.setJenisPetugasPe(element.getKdJenisPetugasPe().getJenisPetugasPe()); jenisPetugasPelaksana.setKdJenisPetugasPe((byte) 0); jenisPetugasPelaksana.setKdProfile((short) 0); - jenisPetugasPelaksana.setqJenisPetugasPe((byte) 0); + jenisPetugasPelaksana.setQJenisPetugasPe((byte) 0); jenisPetugasPelaksana.setStatusEnabled(true); jenisPetugasPelaksanaDao.save(jenisPetugasPelaksana); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiSmsServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiSmsServiceImpl.java index 734afc24..ad72b88d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiSmsServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiSmsServiceImpl.java @@ -40,13 +40,13 @@ import com.jasamedika.medifirst2000.vo.RuanganSmsVO; */ @Service("registrasiSmsService") public class RegistrasiSmsServiceImpl extends BaseVoServiceImpl implements RegistrasiSmsService { - + @Autowired private PasienDao pasienDao; - + @Autowired private RuanganDao ruanganDao; - + @Autowired private JadwalDokterDao jadwalDokterDao; @@ -376,7 +376,7 @@ public class RegistrasiSmsServiceImpl extends BaseVoServiceImpl implements Regis if (CommonUtil.isNotNullOrEmpty(list)) { for (JadwalDokter jadwal : list) { DokterSmsVO local = new DokterSmsVO(); - local.setKodePegawai(String.valueOf(jadwal.getDokter().getqPegawai())); + local.setKodePegawai(String.valueOf(jadwal.getDokter().getQPegawai())); local.setNamaPegawai(jadwal.getDokter().getNamaLengkap()); resultList.add(local); result.put("dokter", resultList); @@ -401,7 +401,7 @@ public class RegistrasiSmsServiceImpl extends BaseVoServiceImpl implements Regis JadwalDokterSmsVO jadwalDokter = new JadwalDokterSmsVO(); jadwalDokter.setKodeRuangan(jadwal.getRuangan().getKdRuangan()); jadwalDokter.setNamaRuangan(jadwal.getRuangan().getNamaRuangan()); - jadwalDokter.setKodePegawai(jadwal.getDokter().getqPegawai()); + jadwalDokter.setKodePegawai(jadwal.getDokter().getQPegawai()); jadwalDokter.setNamaPegawai(jadwal.getDokter().getNamaLengkap()); jadwalDokter.setTanggal(format.format(jadwal.getTanggalJadwal())); jadwalDokterList.add(jadwalDokter); 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 4d1eb9d8..3d43457e 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 @@ -1575,8 +1575,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re Pegawai resultDomain = rekamDataPegawaiDao.save(pegawai); if (CommonUtil.isNotNullOrEmpty(resultDomain)) { - if (CommonUtil.isNotNullOrEmpty(resultDomain.getqPegawai())) { - resultDomain.setqPegawai(resultDomain.getId().shortValue()); + if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) { + resultDomain.setQPegawai(resultDomain.getId().shortValue()); rekamDataPegawaiDao.save(resultDomain); this.saveHistoryPegawai(pegawai, perubahan); @@ -2541,8 +2541,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re Pegawai resultDomain = rekamDataPegawaiDao.save(model); if (CommonUtil.isNotNullOrEmpty(resultDomain)) { - if (CommonUtil.isNotNullOrEmpty(resultDomain.getqPegawai())) { - resultDomain.setqPegawai(resultDomain.getId().shortValue()); + if (CommonUtil.isNotNullOrEmpty(resultDomain.getQPegawai())) { + resultDomain.setQPegawai(resultDomain.getId().shortValue()); rekamDataPegawaiDao.save(resultDomain); this.saveHistoryPegawai(model, perubahan); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiDto.java index ccf5c02e..13702fe5 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiDto.java @@ -7,11 +7,19 @@ import org.hibernate.validator.constraints.NotEmpty; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + /** * @author salmanoe * @since Feb 24, 2023 */ +@Getter +@Setter public class PegawaiDto { + public PegawaiDto() { + } + @NotNull(message = "ID Pegawai tidak boleh null") @Caption(value = "ID Pegawai") private Integer id; @@ -20,23 +28,4 @@ public class PegawaiDto { @Pattern(regexp = "\\d{16}", message = "Format NIK tidak sesuai") @Caption(value = "NIK Pegawai") private String noIdentitas; - - public PegawaiDto() { - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getNoIdentitas() { - return noIdentitas; - } - - public void setNoIdentitas(String noIdentitas) { - this.noIdentitas = noIdentitas; - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java index 26b867f5..54f5d739 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java @@ -1,181 +1,55 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +import static javax.persistence.FetchType.LAZY; /** * class AsalProduk * * @author Generator */ -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "AsalProduk_M") -@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class AsalProduk extends BaseMaster { @NotNull(message = "Asal Produk tidak boleh kosong") @Column(name = "AsalProduk", nullable = false, length = 30) @Caption(value = "Asal Produk") private String asalProduk; - public void setAsalProduk(String asalProduk) { - this.asalProduk = asalProduk; - } - - public String getAsalProduk() { - return this.asalProduk; - } - @Caption(value = "Kode Asal Produk") private Byte kdAsalProduk; - @NotNull(message = "QAsal Produk tidak boleh kosong") - @Column(name = "QAsalProduk", nullable = false) - public Byte getKdAsalProduk() { - return kdAsalProduk; - } - - public void setKdAsalProduk(Byte kdAsalProduk) { - this.kdAsalProduk = kdAsalProduk; - } - - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDepartemenFk") @Caption(value = "Object Departemen") private Departemen departemen; - public void setDepartemen(Departemen departemen) { - this.departemen = departemen; - } - - public Departemen getDepartemen() { - return this.departemen; - } - @Column(name = "ObjectDepartemenFk", insertable = false, updatable = false) private Integer departemenId; - public Integer getDepartemenId() { - return departemenId; - } - - public void setDepartemenId(Integer departemenId) { - this.departemenId = departemenId; - } - - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelompokProdukFk") @Caption(value = "Object Kelompok Produk") private KelompokProduk kelompokProduk; - public void setKelompokProduk(KelompokProduk kelompokProduk) { - this.kelompokProduk = kelompokProduk; - } - - public KelompokProduk getKelompokProduk() { - return this.kelompokProduk; - } - @Column(name = "ObjectKelompokProdukFk", insertable = false, updatable = false, nullable = false) private Integer kelompokProdukId; - public Integer getKelompokProdukId() { - return kelompokProdukId; - } - - public void setKelompokProdukId(Integer kelompokProdukId) { - this.kelompokProdukId = kelompokProdukId; - } - @Caption(value = "QAsal Produk") private Byte qAsalProduk; - public Byte getqAsalProduk() { - return qAsalProduk; - } - - public void setqAsalProduk(Byte qAsalProduk) { - this.qAsalProduk = qAsalProduk; - } - - /* - * @JsonManagedReference - * - * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, - * mappedBy="kdasalproduk") private Set - * HargaNettoDiscPasienPulangSet = new HashSet(); - * - * public Set getHargaNettoDiscPasienPulangSet() { - * return HargaNettoDiscPasienPulangSet; } - * - * public void setHargaNettoDiscPasienPulangSet(Set - * hargaNettoDiscPasienPulangSet) { HargaNettoDiscPasienPulangSet = - * hargaNettoDiscPasienPulangSet; } - * - * @JsonManagedReference - * - * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, - * mappedBy="kdasalproduk") private Set - * HargaNettoProdukByKelasSet = new HashSet(); - * - * public Set getHargaNettoProdukByKelasSet() { - * return HargaNettoProdukByKelasSet; } - * - * public void setHargaNettoProdukByKelasSet(Set - * hargaNettoProdukByKelasSet) { HargaNettoProdukByKelasSet = - * hargaNettoProdukByKelasSet; } - * - * @JsonManagedReference - * - * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, - * mappedBy="kdasalproduk") private Set - * HargaNettoProdukByKelasDSet = new HashSet(); - * - * public Set getHargaNettoProdukByKelasDSet() { - * return HargaNettoProdukByKelasDSet; } - * - * public void setHargaNettoProdukByKelasDSet(Set - * hargaNettoProdukByKelasDSet) { HargaNettoProdukByKelasDSet = - * hargaNettoProdukByKelasDSet; } - */ - - /* - * @JsonManagedReference - * - * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, - * mappedBy="kdasalproduk") private Set - * HargaNettoProdukByTerimaSet = new HashSet(); - * - * public Set getHargaNettoProdukByTerimaSet() { - * return HargaNettoProdukByTerimaSet; } - * - * public void setHargaNettoProdukByTerimaSet(Set - * hargaNettoProdukByTerimaSet) { HargaNettoProdukByTerimaSet = - * hargaNettoProdukByTerimaSet; } - */ - @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalproduk_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.asalproduk_m_id_seq", sequenceName = "public.asalproduk_m_id_seq", allocationSize = 1) + @SequenceGenerator(name = "public.asalproduk_m_id_seq", sequenceName = "public.asalproduk_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - - public Integer getId() { - - return id; - } - - public void setId(Integer id) { - this.id = id; - } } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisPetugasPelaksana.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisPetugasPelaksana.java index aecb215a..42f2ec30 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisPetugasPelaksana.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JenisPetugasPelaksana.java @@ -1,68 +1,40 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; + +import static javax.persistence.FetchType.LAZY; /** * class JenisPetugasPelaksana * * @author Generator */ -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "JenisPetugasPelaksana_M") -@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class JenisPetugasPelaksana extends BaseMaster { @NotNull(message = "Jenis Petugas Pe tidak boleh kosong") @Column(name = "JenisPetugasPe", nullable = false, length = 50) @Caption(value = "Jenis Petugas Pe") private String jenisPetugasPe; - public void setJenisPetugasPe(String jenisPetugasPe) { - this.jenisPetugasPe = jenisPetugasPe; - } - - public String getJenisPetugasPe() { - return this.jenisPetugasPe; - } - @NotNull(message = "Kd Jenis Petugas Pe tidak boleh kosong") @Column(name = "KdJenisPetugasPe", nullable = false) @Caption(value = "Kode Jenis Petugas Pe") private Byte kdJenisPetugasPe; - public void setKdJenisPetugasPe(Byte kdJenisPetugasPe) { - this.kdJenisPetugasPe = kdJenisPetugasPe; - } - - public Byte getKdJenisPetugasPe() { - return this.kdJenisPetugasPe; - } - - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKomponenHargaFk") - @Caption(value = "Object Komponen Harga") private KomponenHarga komponenHarga; - public void setKomponenHarga(KomponenHarga komponenHarga) { - this.komponenHarga = komponenHarga; - } - - public KomponenHarga getKomponenHarga() { - return this.komponenHarga; - } - @Column(name = "ObjectKomponenHargaFk", insertable = false, updatable = false) private Integer komponenHargaId; @@ -71,26 +43,9 @@ public class JenisPetugasPelaksana extends BaseMaster { @Caption(value = "QJenis Petugas Pe") private Byte qJenisPetugasPe; - public void setqJenisPetugasPe(Byte qJenisPetugasPe) { - this.qJenisPetugasPe = qJenisPetugasPe; - } - - public Byte getqJenisPetugasPe() { - return this.qJenisPetugasPe; - } - @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.jenispetugaspelaksana_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.jenispetugaspelaksana_m_id_seq", sequenceName = "public.jenispetugaspelaksana_m_id_seq", allocationSize = 1) + @SequenceGenerator(name = "public.jenispetugaspelaksana_m_id_seq", sequenceName = "public.jenispetugaspelaksana_m_id_seq", allocationSize = 1) @Column(name = "id") protected Integer id; - - public Integer getId() { - - return id; - } - - public void setId(Integer id) { - this.id = id; - } } \ No newline at end of file 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 ea6cd92c..a97a7e85 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 @@ -1,26 +1,22 @@ package com.jasamedika.medifirst2000.entities; +import com.fasterxml.jackson.annotation.JsonBackReference; +import com.jasamedika.medifirst2000.base.BaseMasterPegawai; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -import com.fasterxml.jackson.annotation.JsonBackReference; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.jasamedika.medifirst2000.base.BaseMasterPegawai; -import com.jasamedika.medifirst2000.helper.Caption; +import static javax.persistence.FetchType.LAZY; +@Getter +@Setter @Entity @Table(name = "Pegawai_M") -@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class Pegawai extends BaseMasterPegawai { public Pegawai(String namaLengkap, String namaPanggilan, String nikIntern, String nipPns, String noIdentitas, String npwp, Integer id) { @@ -48,10 +44,10 @@ public class Pegawai extends BaseMasterPegawai { this.email = email; this.ruangan = new Ruangan(namaRuangan, ruanganId, kdDepartemen, namaDepartemen, departemenId); } - + public Pegawai(String namaLengkap, String namaPanggilan, String nikIntern, String nipPns, String noIdentitas, - String npwp,Integer unitKerjaId, String unitKerja, Integer id, String email, Integer ruanganId, String namaRuangan, String kdDepartemen, - String namaDepartemen, Integer departemenId) { + String npwp, Integer unitKerjaId, String unitKerja, Integer id, String email, Integer ruanganId, + String namaRuangan, String kdDepartemen, String namaDepartemen, Integer departemenId) { super(); this.namaLengkap = namaLengkap; this.namaPanggilan = namaPanggilan; @@ -61,7 +57,7 @@ public class Pegawai extends BaseMasterPegawai { this.npwp = npwp; this.id = id; this.email = email; - this.unitKerja = new SubUnitKerjaPegawai ( unitKerjaId, unitKerja); + this.unitKerja = new SubUnitKerjaPegawai(unitKerjaId, unitKerja); this.ruangan = new Ruangan(namaRuangan, ruanganId, kdDepartemen, namaDepartemen, departemenId); } @@ -76,14 +72,15 @@ public class Pegawai extends BaseMasterPegawai { this.id = id; this.namaLengkap = namaLengkap; } - + public Pegawai(Integer id, String namaLengkap, String nipPns) { this.id = id; this.namaLengkap = namaLengkap; this.nipPns = nipPns; } - public Pegawai(Integer pegawai, Integer jabatan, String namaJabatan, Integer subUnitKerjaPegawai, Integer unitKerjaPegawai) { + public Pegawai(Integer pegawai, Integer jabatan, String namaJabatan, Integer subUnitKerjaPegawai, + Integer unitKerjaPegawai) { super(); this.id = pegawai; this.jabatanInternal = new Jabatan(jabatan, namaJabatan); @@ -95,122 +92,122 @@ public class Pegawai extends BaseMasterPegawai { } - @Column(name = "Nip", nullable = true) + @Column(name = "Nip") @Caption(value = "Nip") private String nip; - @Column(name = "Nama", nullable = true) + @Column(name = "Nama") @Caption(value = "Nama") private String nama; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KedudukanFk") @Caption(value = "Kedudukan") private Kedudukan kedudukan; - @Column(name = "KedudukanFk", insertable = false, updatable = false, nullable = true) + @Column(name = "KedudukanFk", insertable = false, updatable = false) private Integer kedudukanId; - @Column(name = "TanggalMeninggal", nullable = true) + @Column(name = "TanggalMeninggal") @Caption(value = "TanggalMeninggal") private Date tanggalMeninggal; - @Column(name = "IdFinger", nullable = true) + @Column(name = "IdFinger") @Caption(value = "IdFinger") private String idFinger; - @Column(name = "KodeGapokFk", insertable = false, updatable = false, nullable = true) + @Column(name = "KodeGapokFk", insertable = false, updatable = false) private String kodeGapokId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectGolonganFk") @Caption(value = "Golongan") private Golongan Golongan; - @Column(name = "ObjectGolonganFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectGolonganFk", insertable = false, updatable = false) private Integer GolonganId; - - @ManyToOne(fetch = FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectGolonganPegawaiFk") @Caption(value = "Golongan Pegawai") private GolonganPegawai golonganPegawai; - @Column(name = "ObjectGolonganPegawaiFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectGolonganPegawaiFk", insertable = false, updatable = false) private Integer golonganPegawaiId; - - @Column(name = "Pensiun", nullable = true) + + @Column(name = "Pensiun") @Caption(value = "Pensiun") private Integer pensiun; - + @Column(name = "tglPensiun") @Caption(value = "tglPensiun") private Date tglPensiun; - @Column(name = "TunjanganFungsional", nullable = true) + @Column(name = "TunjanganFungsional") @Caption(value = "TunjanganFungsional") private String tunjanganFungsional; - @Column(name = "TunjanganPapua", nullable = true) + @Column(name = "TunjanganPapua") @Caption(value = "TunjanganPapua") private Integer tunjanganPapua; - @Column(name = "WilayahTerperinci", nullable = true) + @Column(name = "WilayahTerperinci") @Caption(value = "WilayahTerperinci") private Integer wilayahTerperinci; - @Column(name = "TunjanganUmum", nullable = true) + @Column(name = "TunjanganUmum") @Caption(value = "TunjanganUmum") private Integer tunjanganUmum; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "StatusKawinFk") @Caption(value = "Status Kawin") private StatusPerkawinan statusKawin; - @Column(name = "StatusKawinFk", insertable = false, updatable = false, nullable = true) + @Column(name = "StatusKawinFk", insertable = false, updatable = false) private Integer statusKawinId; - @Column(name = "Beras", nullable = true) + @Column(name = "Beras") @Caption(value = "Beras") private String beras; - @Column(name = "SewaRumah", nullable = true) + @Column(name = "SewaRumah") @Caption(value = "SewaRumah") private String sewaRumah; - @Column(name = "NomorRekening", nullable = true) + @Column(name = "NomorRekening") @Caption(value = "NomorRekening") private String nomorRekening; - @Column(name = "NamaRekening", nullable = true) + @Column(name = "NamaRekening") @Caption(value = "NamaRekening") private String namaRekening; - @Column(name = "KodeBank", nullable = true) + @Column(name = "KodeBank") @Caption(value = "KodeBank") private String kodeBank; - @Column(name = "Alamat", nullable = true) + @Column(name = "Alamat") @Caption(value = "Alamat") private String alamat; - @Column(name = "KodePos", nullable = true) + @Column(name = "KodePos") @Caption(value = "KodePos") private String kodePos; @Caption(value = "Bank Rekening Atas Nama") - @Column(name = "BankRekeningAtasNama", nullable = true) + @Column(name = "BankRekeningAtasNama") private String bankRekeningAtasNama; @Caption(value = "Bank Rekening Nama") - @Column(name = "BankRekeningNama", nullable = true) + @Column(name = "BankRekeningNama") private String bankRekeningNama; @Caption(value = "Bank Rekening Nomor") - @Column(name = "BankRekeningNomor", nullable = true) + @Column(name = "BankRekeningNomor") private String bankRekeningNomor; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectAgamaFk") @Caption(value = "Object Agama") private Agama agama; @@ -218,7 +215,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectAgamaFk", insertable = false, updatable = false) private Integer agamaId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDetailKategoryPegawaiFk") @Caption(value = "Object Detail Kategory Pegawai") private DetailKategoryPegawai detailKategoryPegawai; @@ -226,7 +223,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectDetailKategoryPegawaiFk", insertable = false, updatable = false) private Integer detailKategoryPegawaiId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDokumenSuratLamarFk") @Caption(value = "Object Dokumen Surat Lamar") private Dokumen dokumen; @@ -234,7 +231,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectDokumenSuratLamarFk", insertable = false, updatable = false) private Integer dokumenId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectEselonFk") @Caption(value = "Object Eselon") private Eselon eselon; @@ -242,7 +239,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectEselonFk", insertable = false, updatable = false) private Integer eselonId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectGolonganDarahFk") @Caption(value = "Object Golongan Darah") private GolonganDarah golonganDarah; @@ -250,23 +247,23 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectGolonganDarahFk", insertable = false, updatable = false) private Integer golonganDarahId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJabatanFungsionalFk") @Caption(value = "Object Jabatan Fungsional") private Jabatan jabatanFungsional; - @Column(name = "ObjectJabatanFungsionalFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectJabatanFungsionalFk", insertable = false, updatable = false) private Integer jabatanFungsionalId; - - @ManyToOne(fetch = FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectUnitkerjaPegawaiFk") @Caption(value = "Object Unitkerja") private SubUnitKerjaPegawai unitKerja; - @Column(name = "ObjectUnitkerjaPegawaiFk", insertable = false, updatable = false, nullable = true) - private Integer unitKerjaId; + @Column(name = "ObjectUnitkerjaPegawaiFk", insertable = false, updatable = false) + private Integer unitKerjaId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "objectjabatanInternalfk") @Caption(value = "Object Jabatan Internal") private Jabatan jabatanInternal; @@ -274,7 +271,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "objectjabatanInternalfk", insertable = false, updatable = false) private Integer jabatanInternalId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJabatanLamarFk") @Caption(value = "Object Jabatan Lamar") private Jabatan jabatanLamar; @@ -282,36 +279,31 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectJabatanLamarFk", insertable = false, updatable = false) private Integer jabatanLamarId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJabatanStrukturalFk") @Caption(value = "Object Jabatan Struktural") private Jabatan jabatanStruktural; - @Column(name = "ObjectJabatanStrukturalFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectJabatanStrukturalFk", insertable = false, updatable = false) private Integer jabatanStrukturalId; - -// @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "pegawai") -// private Set mapPegawaiJabatanToUnitKerja = new HashSet(); - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJenisKelaminFk") -// @NotNull(message = "Object Jenis Kelamin Harus Diisi") @Caption(value = "Object Jenis Kelamin") private JenisKelamin jenisKelamin; - @Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false) private Integer jenisKelaminId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJenisPegawaiFk") -// @NotNull(message = "Object Jenis Pegawai Harus Diisi") @Caption(value = "Object Jenis Pegawai") private JenisPegawai jenisPegawai; - @Column(name = "ObjectJenisPegawaiFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectJenisPegawaiFk", insertable = false, updatable = false) private Integer jenisPegawaiId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectJenisPegawaiLamarFk") @Caption(value = "Object Jenis Pegawai Lamar") private JenisPegawai jenisPegawaiLamar; @@ -319,7 +311,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectJenisPegawaiLamarFk", insertable = false, updatable = false, nullable = false) private Integer jenisPegawaiLamarId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKualifikasiJurusanFk") @Caption(value = "Object Kualifikasi Jurusan") private KualifikasiJurusan kualifikasiJurusan; @@ -327,16 +319,15 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectKualifikasiJurusanFk", insertable = false, updatable = false) private Integer kualifikasiJurusanId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectNegaraFk") -// @NotNull(message = "Object Negara Harus Diisi") @Caption(value = "Object Negara") private Negara negara; - @Column(name = "ObjectNegaraFk", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectNegaraFk", insertable = false, updatable = false) private Integer negaraId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPangkatFk") @Caption(value = "Object Pangkat") private Pangkat pangkat; @@ -344,7 +335,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectPangkatFk", insertable = false, updatable = false, nullable = false) private Integer pangkatId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPendidikanTerakhirFk") @Caption(value = "Object Pendidikan Terakhir") private Pendidikan pendidikan; @@ -352,7 +343,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectPendidikanTerakhirFk", insertable = false, updatable = false) private Integer pendidikanId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPTKPFk") @Caption(value = "Object P T K P") private PenghasilanTidakKenaPajak penghasilanTidakKenaPajak; @@ -360,7 +351,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectPTKPFk", insertable = false, updatable = false) private Integer penghasilanTidakKenaPajakId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRangeTotalNilaiScoreFk") @Caption(value = "Object Range Total Nilai Score") private Range range; @@ -368,7 +359,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectRangeTotalNilaiScoreFk", insertable = false, updatable = false) private Integer rangeId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRuanganKerjaFk") @Caption(value = "Object Ruangan Kerja") private Ruangan ruangan; @@ -376,23 +367,23 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectRuanganKerjaFk", insertable = false, updatable = false) private Integer ruanganId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectShiftKerja") @Caption(value = "ObjectShiftKerja") private KelompokShift shiftKerja; - - @ManyToOne(fetch = FetchType.LAZY) + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "LevelTingkatFk") @Caption(value = "Level Tingkat") private LevelTingkat levelTingkat; - - @Column(name = "LevelTingkatFk", insertable = false, updatable = false, nullable = true) + + @Column(name = "LevelTingkatFk", insertable = false, updatable = false) private Integer levelTingkatId; - - @Column(name = "ObjectShiftKerja", insertable = false, updatable = false, nullable = true) + + @Column(name = "ObjectShiftKerja", insertable = false, updatable = false) private Integer shiftKerjaId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KategoryPegawai") @Caption(value = "Object Status Pegawai") private KategoryPegawai kategoryPegawai; @@ -400,7 +391,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "KategoryPegawai", insertable = false, updatable = false) private Integer kategoryPegawaiId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusPegawaiFk") @Caption(value = "Object Status Pegawai") private StatusPegawai statusPegawai; @@ -408,7 +399,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectStatusPegawaiFk", insertable = false, updatable = false) private Integer statusPegawaiId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusPerkawinanPegawaiFk") @Caption(value = "Object Status Perkawinan Pegawai") private StatusPerkawinanPegawai statusPerkawinanPegawai; @@ -416,7 +407,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectStatusPerkawinanPegawaiFk", insertable = false, updatable = false) private Integer statusPerkawinanPegawaiId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectSukuFk") @Caption(value = "Object Suku") private Suku suku; @@ -424,7 +415,7 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectSukuFk", insertable = false, updatable = false) private Integer sukuId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectTitleFk") @Caption(value = "Object Title") private TitlePasien titlePasien; @@ -432,57 +423,39 @@ public class Pegawai extends BaseMasterPegawai { @Column(name = "ObjectTitleFk", insertable = false, updatable = false) private Integer titlePasienId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectTypePegawaiFk") @Caption(value = "Object Type Pegawai") private TypePegawai typePegawai; @Column(name = "ObjectTypePegawaiFk", insertable = false, updatable = false) private Integer typePegawaiId; - -// @ManyToOne(fetch = FetchType.LAZY) -// @JoinColumn(name = "ObjectAtasanLangsungFk") -// @Caption(value = "Object Atasan Langsung") -// private Pegawai atasanLangsung; - -// @Column(name = "ObjectAtasanLangsungFk", insertable = false, updatable = false) -// private Integer atasanLangsungId; - -// @ManyToOne(fetch = FetchType.LAZY) -// @JoinColumn(name = "ObjectPejabatPenilaiFk") -// @Caption(value = "Object Pejabat Penilai") -// private Pegawai pejabatPenilai; - -// @Column(name = "ObjectPejabatPenilaiFk", insertable = false, updatable = false) -// private Integer pejabatPenilaiId; @Caption(value = "Nama Keluarga") - @Column(name = "NamaKeluarga", nullable = true) + @Column(name = "NamaKeluarga") private String namaKeluarga; @Caption(value = "Nama Lengkap") -// @NotNull(message = "Nama Lengkap tidak boleh kosong") - @Column(name = "NamaLengkap", nullable = true) + @Column(name = "NamaLengkap") private String namaLengkap; @Caption(value = "Nama Panggilan") - @Column(name = "NamaPanggilan", nullable = true) + @Column(name = "NamaPanggilan") private String namaPanggilan; @Caption(value = "NIK_ Intern") - @Column(name = "NIK_Intern", nullable = true) + @Column(name = "NIK_Intern") private String nikIntern; @Caption(value = "NIP_ P N S") - @Column(name = "NIP_PNS", nullable = true) + @Column(name = "NIP_PNS") private String nipPns; @Caption(value = "No Identitas") -// @NotNull(message = "No Identitas tidak boleh kosong") - @Column(name = "NoIdentitas", nullable = true) + @Column(name = "NoIdentitas") private String noIdentitas; - @Column(name = "noCm", nullable = true, unique = true) + @Column(name = "noCm", unique = true) @Caption(value = "No C M") private String noCm; @@ -490,1245 +463,144 @@ public class Pegawai extends BaseMasterPegawai { private Integer noStruk_TTujuanLastId; @Caption(value = "NP W P") - @Column(name = "NPWP", nullable = true) - private String npwp; - + @Column(name = "NPWP") + private String npwp; + @Caption(value = "gelarDepan") - @Column(name = "gelarDepan", nullable = true) + @Column(name = "gelarDepan") private String gelarDepan; @Caption(value = "gelarBelakang") - @Column(name = "gelarBelakang", nullable = true) + @Column(name = "gelarBelakang") private String gelarBelakang; @Caption(value = "Photo Diri") - @Column(name = "PhotoDiri", nullable = true) + @Column(name = "PhotoDiri") private String photoDiri; @Caption(value = "QPegawai") -// @NotNull(message = "QPegawai tidak boleh kosong") - @Column(name = "QPegawai", nullable = true) + @Column(name = "QPegawai") private short qPegawai; @Caption(value = "Qty Anak") - @Column(name = "QtyAnak", nullable = true) + @Column(name = "QtyAnak") private Byte qtyAnak; @Caption(value = "Qty Tanggungan") - @Column(name = "QtyTanggungan", nullable = true) + @Column(name = "QtyTanggungan") private Byte qtyTanggungan; @Caption(value = "Qty Total Jiwa") - @Column(name = "QtyTotalJiwa", nullable = true) + @Column(name = "QtyTotalJiwa") private Byte qtyTotalJiwa; @Caption(value = "Status Rhesus") - @Column(name = "StatusRhesus", nullable = true) + @Column(name = "StatusRhesus") private String statusRhesus; @Caption(value = "Tempat Lahir") - @Column(name = "TempatLahir", nullable = true) + @Column(name = "TempatLahir") private String tempatLahir; @Caption(value = "Total Nilai Score") - @Column(name = "TotalNilaiScore", nullable = true) + @Column(name = "TotalNilaiScore") private Double totalNilaiScore; @Caption(value = "Email") - @Column(name = "Email", nullable = true) + @Column(name = "Email") private String email; @Caption(value = "Email Alternatif") - @Column(name = "EmailAlternatif", nullable = true) + @Column(name = "EmailAlternatif") private String emailAlternatif; @Caption(value = "No Tlp") - @Column(name = "NoTlp", nullable = true) + @Column(name = "NoTlp") private String noTlp; @Caption(value = "No Handphone") - @Column(name = "NoHandphone", nullable = true) + @Column(name = "NoHandphone") private String noHandphone; - // --------------------------add by Pratama----------------------------// - @Column(name = "tglkeluar", nullable = true) + + @Column(name = "tglkeluar") private Date tglkeluar; - @Column(name = "TglMasuk", nullable = true) + @Column(name = "TglMasuk") private Date tglMasuk; - @Column(name = "TglLahir", nullable = true) + @Column(name = "TglLahir") private Date tglLahir; - - @Column(name = "noBPJS", nullable = true) + + @Column(name = "noBPJS") private String noBPJS; - @Column(name = "noSip", nullable = true) + @Column(name = "noSip") private String noSip; - - @Column(name = "tglTerbitSip", nullable = true) + + @Column(name = "tglTerbitSip") private Date tglTerbitSip; - - @Column(name = "tglBerakhirSip", nullable = true) + + @Column(name = "tglBerakhirSip") private Date tglBerakhirSip; - - @Column(name = "noStr", nullable = true) + + @Column(name = "noStr") private String noStr; - - @Column(name = "tglTerbitStr", nullable = true) + + @Column(name = "tglTerbitStr") private Date tglTerbitStr; - - @Column(name = "tglBerakhirStr", nullable = true) + + @Column(name = "tglBerakhirStr") private Date tglBerakhirStr; - + @JsonBackReference - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pegawai") + @OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "pegawai") private Set riwayatPendidikanSet = new HashSet<>(); - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectSatuanKerjaFK") private SatuanKerja satuanKerja; - @Column(name = "ObjectSatuanKerjaFK", insertable = false, updatable = false, nullable = true) + @Column(name = "ObjectSatuanKerjaFK", insertable = false, updatable = false) private Integer satuanKerjaId; - // Add by lukman for peserta didik - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRekananFk") @Caption(value = "Object Rekanan") private Rekanan rekanan; - - @Column(name="ObjectRekananFk",insertable = false, updatable = false, nullable = true) + + @Column(name = "ObjectRekananFk", insertable = false, updatable = false) private Integer rekananId; - // Add by lukman for peserta didik - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPeriodePengajarFk") @Caption(value = "Object periodePengajar") private PeriodePengajar periodePengajar; - - @Column(name="ObjectPeriodePengajarFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = true) + + @Column(name = "ObjectPeriodePengajarFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false) private String periodePengajarId; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelompokJabatanFk") -// @NotNull(message = "Kd KelompokJabatan tidak boleh kosong") @Caption(value = "Object KelompokJabatan") private NilaiKelompokJabatan detailKelompokJabatan; - - @Column(name="ObjectKelompokJabatanFk",insertable = false, updatable = false, nullable = true) + + @Column(name = "ObjectKelompokJabatanFk", insertable = false, updatable = false) private Integer detailKelompokJabatanId; - - @Column(name = "grade", nullable = true) + + @Column(name = "grade") private Double grade; - - @Column(name = "nilaiJabatan", nullable = true) + + @Column(name = "nilaiJabatan") private Double nilaiJabatan; - - @Column(name = "isMenanggung", nullable = true) + + @Column(name = "isMenanggung") private Boolean isMenanggung; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPegawaiPembimbingFk") @Caption(value = "Object PegawaiPembimbing") private Pegawai pegawaiPembimbing; - - @Column(name="ObjectPegawaiPembimbingFk",insertable = false, updatable = false, nullable = true) + + @Column(name = "ObjectPegawaiPembimbingFk", insertable = false, updatable = false) private Integer pegawaiPembimbingId; - - 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; - } - - 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 Kedudukan getKedudukan() { - return kedudukan; - } - - public void setKedudukan(Kedudukan 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 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 Golongan getGolongan() { - return Golongan; - } - - public void setGolongan(Golongan golongan) { - Golongan = golongan; - } - - public Integer getGolonganId() { - return GolonganId; - } - - public void setGolonganId(Integer golonganId) { - GolonganId = golonganId; - } - - public GolonganPegawai getGolonganPegawai() { - return golonganPegawai; - } - - public void setGolonganPegawai(GolonganPegawai golonganPegawai) { - this.golonganPegawai = golonganPegawai; - } - - 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 StatusPerkawinan getStatusKawin() { - return statusKawin; - } - - public void setStatusKawin(StatusPerkawinan 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 getNomorRekening() { - return nomorRekening; - } - - public void setNomorRekening(String nomorRekening) { - this.nomorRekening = nomorRekening; - } - - public String getNamaRekening() { - return namaRekening; - } - - public void setNamaRekening(String namaRekening) { - this.namaRekening = namaRekening; - } - - public String getKodeBank() { - return kodeBank; - } - - public void setKodeBank(String kodeBank) { - this.kodeBank = kodeBank; - } - - 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 Agama getAgama() { - return agama; - } - - public void setAgama(Agama agama) { - this.agama = agama; - } - - public Integer getAgamaId() { - return agamaId; - } - - public void setAgamaId(Integer agamaId) { - this.agamaId = agamaId; - } - - public DetailKategoryPegawai getDetailKategoryPegawai() { - return detailKategoryPegawai; - } - - public void setDetailKategoryPegawai(DetailKategoryPegawai detailKategoryPegawai) { - this.detailKategoryPegawai = detailKategoryPegawai; - } - - public Integer getDetailKategoryPegawaiId() { - return detailKategoryPegawaiId; - } - - public void setDetailKategoryPegawaiId(Integer detailKategoryPegawaiId) { - this.detailKategoryPegawaiId = detailKategoryPegawaiId; - } - - public Dokumen getDokumen() { - return dokumen; - } - - public void setDokumen(Dokumen dokumen) { - this.dokumen = dokumen; - } - - public Integer getDokumenId() { - return dokumenId; - } - - public void setDokumenId(Integer dokumenId) { - this.dokumenId = dokumenId; - } - - public Eselon getEselon() { - return eselon; - } - - public void setEselon(Eselon eselon) { - this.eselon = eselon; - } - - public Integer getEselonId() { - return eselonId; - } - - public void setEselonId(Integer eselonId) { - this.eselonId = eselonId; - } - - public GolonganDarah getGolonganDarah() { - return golonganDarah; - } - - public void setGolonganDarah(GolonganDarah golonganDarah) { - this.golonganDarah = golonganDarah; - } - - public Integer getGolonganDarahId() { - return golonganDarahId; - } - - public void setGolonganDarahId(Integer golonganDarahId) { - this.golonganDarahId = golonganDarahId; - } - - public Jabatan getJabatanFungsional() { - return jabatanFungsional; - } - - public void setJabatanFungsional(Jabatan jabatanFungsional) { - this.jabatanFungsional = jabatanFungsional; - } - - public Integer getJabatanFungsionalId() { - return jabatanFungsionalId; - } - - public void setJabatanFungsionalId(Integer jabatanFungsionalId) { - this.jabatanFungsionalId = jabatanFungsionalId; - } - - public Jabatan getJabatanInternal() { - return jabatanInternal; - } - - public void setJabatanInternal(Jabatan jabatanInternal) { - this.jabatanInternal = jabatanInternal; - } - - public Integer getJabatanInternalId() { - return jabatanInternalId; - } - - public void setJabatanInternalId(Integer jabatanInternalId) { - this.jabatanInternalId = jabatanInternalId; - } - - public Jabatan getJabatanLamar() { - return jabatanLamar; - } - - public void setJabatanLamar(Jabatan jabatanLamar) { - this.jabatanLamar = jabatanLamar; - } - - public Integer getJabatanLamarId() { - return jabatanLamarId; - } - - public void setJabatanLamarId(Integer jabatanLamarId) { - this.jabatanLamarId = jabatanLamarId; - } - - public Jabatan getJabatanStruktural() { - return jabatanStruktural; - } - - public void setJabatanStruktural(Jabatan jabatanStruktural) { - this.jabatanStruktural = jabatanStruktural; - } - - public Integer getJabatanStrukturalId() { - return jabatanStrukturalId; - } - - public void setJabatanStrukturalId(Integer jabatanStrukturalId) { - this.jabatanStrukturalId = jabatanStrukturalId; - } - -// public Set getMapPegawaiJabatanToUnitKerja() { -// return mapPegawaiJabatanToUnitKerja; -// } - -// public void setMapPegawaiJabatanToUnitKerja(Set mapPegawaiJabatanToUnitKerja) { -// this.mapPegawaiJabatanToUnitKerja = mapPegawaiJabatanToUnitKerja; -// } - - public JenisKelamin getJenisKelamin() { - return jenisKelamin; - } - - public void setJenisKelamin(JenisKelamin jenisKelamin) { - this.jenisKelamin = jenisKelamin; - } - - public Integer getJenisKelaminId() { - return jenisKelaminId; - } - - public void setJenisKelaminId(Integer jenisKelaminId) { - this.jenisKelaminId = jenisKelaminId; - } - - public JenisPegawai getJenisPegawai() { - return jenisPegawai; - } - - public void setJenisPegawai(JenisPegawai jenisPegawai) { - this.jenisPegawai = jenisPegawai; - } - - public Integer getJenisPegawaiId() { - return jenisPegawaiId; - } - - public void setJenisPegawaiId(Integer jenisPegawaiId) { - this.jenisPegawaiId = jenisPegawaiId; - } - - public JenisPegawai getJenisPegawaiLamar() { - return jenisPegawaiLamar; - } - - public void setJenisPegawaiLamar(JenisPegawai jenisPegawaiLamar) { - this.jenisPegawaiLamar = jenisPegawaiLamar; - } - - public Integer getJenisPegawaiLamarId() { - return jenisPegawaiLamarId; - } - - public void setJenisPegawaiLamarId(Integer jenisPegawaiLamarId) { - this.jenisPegawaiLamarId = jenisPegawaiLamarId; - } - - public KualifikasiJurusan getKualifikasiJurusan() { - return kualifikasiJurusan; - } - - public void setKualifikasiJurusan(KualifikasiJurusan kualifikasiJurusan) { - this.kualifikasiJurusan = kualifikasiJurusan; - } - - public Integer getKualifikasiJurusanId() { - return kualifikasiJurusanId; - } - - public void setKualifikasiJurusanId(Integer kualifikasiJurusanId) { - this.kualifikasiJurusanId = kualifikasiJurusanId; - } - - public Negara getNegara() { - return negara; - } - - public void setNegara(Negara negara) { - this.negara = negara; - } - - public Integer getNegaraId() { - return negaraId; - } - - public void setNegaraId(Integer negaraId) { - this.negaraId = negaraId; - } - - public Pangkat getPangkat() { - return pangkat; - } - - public void setPangkat(Pangkat pangkat) { - this.pangkat = pangkat; - } - - public Integer getPangkatId() { - return pangkatId; - } - - public void setPangkatId(Integer pangkatId) { - this.pangkatId = pangkatId; - } - - public Pendidikan getPendidikan() { - return pendidikan; - } - - public void setPendidikan(Pendidikan pendidikan) { - this.pendidikan = pendidikan; - } - - public Integer getPendidikanId() { - return pendidikanId; - } - - public void setPendidikanId(Integer pendidikanId) { - this.pendidikanId = pendidikanId; - } - - public PenghasilanTidakKenaPajak getPenghasilanTidakKenaPajak() { - return penghasilanTidakKenaPajak; - } - - public void setPenghasilanTidakKenaPajak(PenghasilanTidakKenaPajak penghasilanTidakKenaPajak) { - this.penghasilanTidakKenaPajak = penghasilanTidakKenaPajak; - } - - public Integer getPenghasilanTidakKenaPajakId() { - return penghasilanTidakKenaPajakId; - } - - public void setPenghasilanTidakKenaPajakId(Integer penghasilanTidakKenaPajakId) { - this.penghasilanTidakKenaPajakId = penghasilanTidakKenaPajakId; - } - - public Range getRange() { - return range; - } - - public void setRange(Range range) { - this.range = range; - } - - public Integer getRangeId() { - return rangeId; - } - - public void setRangeId(Integer rangeId) { - this.rangeId = rangeId; - } - - public Ruangan getRuangan() { - return ruangan; - } - - public void setRuangan(Ruangan ruangan) { - this.ruangan = ruangan; - } - - public Integer getRuanganId() { - return ruanganId; - } - - public void setRuanganId(Integer ruanganId) { - this.ruanganId = ruanganId; - } - - public KelompokShift getShiftKerja() { - return shiftKerja; - } - - public void setShiftKerja(KelompokShift shiftKerja) { - this.shiftKerja = shiftKerja; - } - - public LevelTingkat getLevelTingkat() { - return levelTingkat; - } - - public void setLevelTingkat(LevelTingkat levelTingkat) { - this.levelTingkat = levelTingkat; - } - - public Integer getShiftKerjaId() { - return shiftKerjaId; - } - - public void setShiftKerjaId(Integer shiftKerjaId) { - this.shiftKerjaId = shiftKerjaId; - } - - public KategoryPegawai getKategoryPegawai() { - return kategoryPegawai; - } - - public void setKategoryPegawai(KategoryPegawai kategoryPegawai) { - this.kategoryPegawai = kategoryPegawai; - } - - public Integer getKategoryPegawaiId() { - return kategoryPegawaiId; - } - - public void setKategoryPegawaiId(Integer kategoryPegawaiId) { - this.kategoryPegawaiId = kategoryPegawaiId; - } - - public StatusPegawai getStatusPegawai() { - return statusPegawai; - } - - public void setStatusPegawai(StatusPegawai statusPegawai) { - this.statusPegawai = statusPegawai; - } - - public Integer getStatusPegawaiId() { - return statusPegawaiId; - } - - public void setStatusPegawaiId(Integer statusPegawaiId) { - this.statusPegawaiId = statusPegawaiId; - } - - public StatusPerkawinanPegawai getStatusPerkawinanPegawai() { - return statusPerkawinanPegawai; - } - - public void setStatusPerkawinanPegawai(StatusPerkawinanPegawai statusPerkawinanPegawai) { - this.statusPerkawinanPegawai = statusPerkawinanPegawai; - } - - public Integer getStatusPerkawinanPegawaiId() { - return statusPerkawinanPegawaiId; - } - - public void setStatusPerkawinanPegawaiId(Integer statusPerkawinanPegawaiId) { - this.statusPerkawinanPegawaiId = statusPerkawinanPegawaiId; - } - - public Suku getSuku() { - return suku; - } - - public void setSuku(Suku suku) { - this.suku = suku; - } - - public Integer getSukuId() { - return sukuId; - } - - public void setSukuId(Integer sukuId) { - this.sukuId = sukuId; - } - - public TitlePasien getTitlePasien() { - return titlePasien; - } - - public void setTitlePasien(TitlePasien titlePasien) { - this.titlePasien = titlePasien; - } - - public Integer getTitlePasienId() { - return titlePasienId; - } - - public void setTitlePasienId(Integer titlePasienId) { - this.titlePasienId = titlePasienId; - } - - public TypePegawai getTypePegawai() { - return typePegawai; - } - - public void setTypePegawai(TypePegawai typePegawai) { - this.typePegawai = typePegawai; - } - - public Integer getTypePegawaiId() { - return typePegawaiId; - } - - public void setTypePegawaiId(Integer typePegawaiId) { - this.typePegawaiId = typePegawaiId; - } - -// public Pegawai getAtasanLangsung() { -// return atasanLangsung; -// } - -// public void setAtasanLangsung(Pegawai atasanLangsung) { -// this.atasanLangsung = atasanLangsung; -// } - -// public Integer getAtasanLangsungId() { -// return atasanLangsungId; -// } - -// public void setAtasanLangsungId(Integer atasanLangsungId) { -// this.atasanLangsungId = atasanLangsungId; -// } - -// public Pegawai getPejabatPenilai() { -// return pejabatPenilai; -// } - -// public void setPejabatPenilai(Pegawai pejabatPenilai) { -// this.pejabatPenilai = pejabatPenilai; -// } - -// public Integer getPejabatPenilaiId() { -// return pejabatPenilaiId; -// } - -// public void setPejabatPenilaiId(Integer pejabatPenilaiId) { -// this.pejabatPenilaiId = pejabatPenilaiId; -// } - - 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 Date getTglMasuk() { - return tglMasuk; - } - - public void setTglMasuk(Date tglMasuk) { - this.tglMasuk = tglMasuk; - } - - public Date getTglLahir() { - return tglLahir; - } - - public void setTglLahir(Date tglLahir) { - this.tglLahir = tglLahir; - } - - public String getNoBPJS() { - return noBPJS; - } - - public void setNoBPJS(String noBPJS) { - this.noBPJS = noBPJS; - } - - public Set getRiwayatPendidikanSet() { - return riwayatPendidikanSet; - } - - public void setRiwayatPendidikanSet(Set riwayatPendidikanSet) { - this.riwayatPendidikanSet = riwayatPendidikanSet; - } - - public SatuanKerja getSatuanKerja() { - return satuanKerja; - } - - public void setSatuanKerja(SatuanKerja satuanKerja) { - this.satuanKerja = satuanKerja; - } - - public Integer getSatuanKerjaId() { - return satuanKerjaId; - } - - public void setSatuanKerjaId(Integer satuanKerjaId) { - this.satuanKerjaId = satuanKerjaId; - } - - public Rekanan getRekanan() { - return rekanan; - } - - public void setRekanan(Rekanan rekanan) { - this.rekanan = rekanan; - } - - public Integer getRekananId() { - return rekananId; - } - - public void setRekananId(Integer rekananId) { - this.rekananId = rekananId; - } - - public PeriodePengajar getPeriodePengajar() { - return periodePengajar; - } - - public void setPeriodePengajar(PeriodePengajar periodePengajar) { - this.periodePengajar = periodePengajar; - } - - public String getPeriodePengajarId() { - return periodePengajarId; - } - - public void setPeriodePengajarId(String periodePengajarId) { - this.periodePengajarId = periodePengajarId; - } - - public Date getTglPensiun() { - return tglPensiun; - } - - public void setTglPensiun(Date tglPensiun) { - this.tglPensiun = tglPensiun; - } - - public SubUnitKerjaPegawai getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(SubUnitKerjaPegawai unitKerja) { - this.unitKerja = unitKerja; - } - - public Integer getUnitKerjaId() { - return unitKerjaId; - } - - public void setUnitKerjaId(Integer unitKerjaId) { - this.unitKerjaId = unitKerjaId; - } - - 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 NilaiKelompokJabatan getDetailKelompokJabatan() { - return detailKelompokJabatan; - } - - public void setDetailKelompokJabatan(NilaiKelompokJabatan detailKelompokJabatan) { - this.detailKelompokJabatan = detailKelompokJabatan; - } - - 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 Boolean getIsMenanggung() { - return isMenanggung; - } - - public void setIsMenanggung(Boolean isMenanggung) { - this.isMenanggung = isMenanggung; - } - - public Integer getDetailKelompokJabatanId() { - return detailKelompokJabatanId; - } - - public void setDetailKelompokJabatanId(Integer detailKelompokJabatanId) { - this.detailKelompokJabatanId = detailKelompokJabatanId; - } - - public Integer getLevelTingkatId() { - return levelTingkatId; - } - - public void setLevelTingkatId(Integer levelTingkatId) { - this.levelTingkatId = levelTingkatId; - } - - public Pegawai getPegawaiPembimbing() { - return pegawaiPembimbing; - } - - public void setPegawaiPembimbing(Pegawai pegawaiPembimbing) { - this.pegawaiPembimbing = pegawaiPembimbing; - } - - public Integer getPegawaiPembimbingId() { - return pegawaiPembimbingId; - } - - public void setPegawaiPembimbingId(Integer pegawaiPembimbingId) { - this.pegawaiPembimbingId = pegawaiPembimbingId; - } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Ruangan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Ruangan.java index 35588fd5..e6cdcee5 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Ruangan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Ruangan.java @@ -1,170 +1,29 @@ package com.jasamedika.medifirst2000.entities; +import com.fasterxml.jackson.annotation.JsonBackReference; +import com.google.gson.annotations.Expose; +import com.jasamedika.medifirst2000.base.BaseMaster; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import com.fasterxml.jackson.annotation.JsonBackReference; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.gson.annotations.Expose; -import com.jasamedika.medifirst2000.base.BaseMaster; -import com.jasamedika.medifirst2000.helper.Caption; +import static javax.persistence.FetchType.LAZY; +@Getter +@Setter @Entity @Table(name = "Ruangan_M") -@JsonSerialize -@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" }) public class Ruangan extends BaseMaster { - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.ruangan_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.ruangan_m_id_seq", sequenceName = "public.ruangan_m_id_seq", allocationSize = 1) - @Column(name = "id") - protected Integer id; - - @Column(name = "KdInternal", nullable = true, length = 5) - @Caption(value = "KodeInternal") - private String kdInternal; - - @Column(name = "AlamatEmail", nullable = true, length = 50) - @Caption(value = "Alamat Email") - private String alamatEmail; - - @Column(name = "Faksimile", nullable = true, length = 30) - @Caption(value = "Faksimile") - private String faksimile; - - @Column(name = "FixedPhone", nullable = true, length = 30) - @Caption(value = "Fixed Phone") - private String fixedPhone; - - @Column(name = "JamBuka", nullable = true, length = 5) - @Caption(value = "Jam Buka") - private String jamBuka; - - @Column(name = "JamTutup", nullable = true, length = 5) - @Caption(value = "Jam Tutup") - private String jamTutup; - - @ManyToOne - @JoinColumn(name = "ObjectUnitKerjaFk") - @Caption(value = "Object Unit Kerja") - private UnitKerjaPegawai unitKerja; - - @Column(name = "ObjectUnitKerjaFk", insertable = false, updatable = false) - private Integer unitKerjaId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ObjectDepartemenFk") - @Expose(serialize = false) - @Caption(value = "Object Departemen") - private Departemen departemen; - - @Column(name = "ObjectDepartemenFk", insertable = false, updatable = false) - private Integer departemenId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ObjectKelasHeadFk") - @Caption(value = "Object Kelas Head") - private Kelas kelasHead; - - @Column(name = "ObjectKelasHeadFk", insertable = false, updatable = false, nullable = false) - private Integer kelasHeadId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ObjectModulAplikasiFk") - @Caption(value = "Object Modul Aplikasi") - private ModulAplikasi modulAplikasi; - - @Column(name = "ObjectModulAplikasiFk", insertable = false, updatable = false) - private Integer modulAplikasiId; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ObjectPegawaiKepalaFk") - @Caption(value = "Object Pegawai Kepala") - private Pegawai pegawaiKepala; - - @Column(name = "ObjectPegawaiKepalaFk", insertable = false, updatable = false) - private Integer pegawaiKepalaId; - - @NotNull(message = "Kd Ruangan tidak boleh kosong") - @Column(name = "KdRuangan", nullable = false, length = 3) - @Caption(value = "Kode Ruangan") - private String kdRuangan; - - @Column(name = "LokasiRuangan", nullable = true, length = 50) - @Caption(value = "Lokasi Ruangan") - private String lokasiRuangan; - - @Column(name = "MobilePhone", nullable = true, length = 30) - @Caption(value = "Mobile Phone") - private String mobilePhone; - - @NotNull(message = "Nama Ruangan tidak boleh kosong") - @Column(name = "NamaRuangan", nullable = false, length = 50) - @Caption(value = "Nama Ruangan") - private String namaRuangan; - - @Column(name = "NoCounter", nullable = true) - @Caption(value = "No Counter") - private Integer noCounter; - - @Column(name = "NoRuangan", nullable = true, length = 4) - @Caption(value = "No Ruangan") - private String noRuangan; - - @Column(name = "PrefixNoAntrian", nullable = true, length = 4) - @Caption(value = "Prefix No Antrian") - private String prefixNoAntrian; - - @NotNull(message = "QRuangan tidak boleh kosong") - @Column(name = "QRuangan", nullable = false) - @Caption(value = "QRuangan") - private short qRuangan; - - @Column(name = "StatusViewData", nullable = true) - @Caption(value = "Status View Data") - private Boolean statusViewData; - - @Column(name = "Website", nullable = true, length = 80) - @Caption(value = "Website") - private String website; - - @Column(name = "tanggal", nullable = true) - @Caption(value = "tanggal") - private Date tanggal; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ObjectRuanganFk") - @Caption(value = "Object Ruangan") - private Ruangan headRuangan; - - @Column(name = "ObjectRuanganFk", insertable = false, updatable = false) - private Integer headRuanganId; - - @JsonBackReference - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "ruangan") - Set kamarSet = new HashSet<>(); - public Ruangan(String jamBuka, String jamTutup, String kdRuangan, String namaRuangan, String noRuangan, Boolean statusViewData, Integer id, Integer departemenId, Ruangan head) { super(); - this.departemenId = departemenId; this.jamBuka = jamBuka; this.jamTutup = jamTutup; this.departemenId = departemenId; @@ -180,7 +39,6 @@ public class Ruangan extends BaseMaster { Boolean statusViewData, Integer id, Integer departemenId) { super(); - this.departemenId = departemenId; this.jamBuka = jamBuka; this.jamTutup = jamTutup; this.departemenId = departemenId; @@ -209,257 +67,138 @@ public class Ruangan extends BaseMaster { } - public Integer getId() { - return id; - } + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.ruangan_m_id_seq") + @SequenceGenerator(name = "public.ruangan_m_id_seq", sequenceName = "public.ruangan_m_id_seq", allocationSize = 1) + @Column(name = "id") + protected Integer id; - public void setId(Integer id) { - this.id = id; - } + @Column(name = "KdInternal", length = 5) + @Caption(value = "KodeInternal") + private String kdInternal; - public String getKdInternal() { - return kdInternal; - } + @Column(name = "AlamatEmail", length = 50) + @Caption(value = "Alamat Email") + private String alamatEmail; - public void setKdInternal(String kdInternal) { - this.kdInternal = kdInternal; - } + @Column(name = "Faksimile", length = 30) + @Caption(value = "Faksimile") + private String faksimile; - public String getAlamatEmail() { - return alamatEmail; - } + @Column(name = "FixedPhone", length = 30) + @Caption(value = "Fixed Phone") + private String fixedPhone; - public void setAlamatEmail(String alamatEmail) { - this.alamatEmail = alamatEmail; - } + @Column(name = "JamBuka", length = 5) + @Caption(value = "Jam Buka") + private String jamBuka; - public String getFaksimile() { - return faksimile; - } + @Column(name = "JamTutup", length = 5) + @Caption(value = "Jam Tutup") + private String jamTutup; - public void setFaksimile(String faksimile) { - this.faksimile = faksimile; - } + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "ObjectUnitKerjaFk") + @Caption(value = "Object Unit Kerja") + private UnitKerjaPegawai unitKerja; - public String getFixedPhone() { - return fixedPhone; - } + @Column(name = "ObjectUnitKerjaFk", insertable = false, updatable = false) + private Integer unitKerjaId; - public void setFixedPhone(String fixedPhone) { - this.fixedPhone = fixedPhone; - } + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "ObjectDepartemenFk") + @Expose(serialize = false) + @Caption(value = "Object Departemen") + private Departemen departemen; - public String getJamBuka() { - return jamBuka; - } + @Column(name = "ObjectDepartemenFk", insertable = false, updatable = false) + private Integer departemenId; - public void setJamBuka(String jamBuka) { - this.jamBuka = jamBuka; - } + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "ObjectKelasHeadFk") + @Caption(value = "Object Kelas Head") + private Kelas kelasHead; - public String getJamTutup() { - return jamTutup; - } + @Column(name = "ObjectKelasHeadFk", insertable = false, updatable = false, nullable = false) + private Integer kelasHeadId; - public void setJamTutup(String jamTutup) { - this.jamTutup = jamTutup; - } + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "ObjectModulAplikasiFk") + @Caption(value = "Object Modul Aplikasi") + private ModulAplikasi modulAplikasi; - public Departemen getDepartemen() { - return departemen; - } + @Column(name = "ObjectModulAplikasiFk", insertable = false, updatable = false) + private Integer modulAplikasiId; - public void setDepartemen(Departemen departemen) { - this.departemen = departemen; - } + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "ObjectPegawaiKepalaFk") + @Caption(value = "Object Pegawai Kepala") + private Pegawai pegawaiKepala; - public Integer getDepartemenId() { - return departemenId; - } + @Column(name = "ObjectPegawaiKepalaFk", insertable = false, updatable = false) + private Integer pegawaiKepalaId; - public void setDepartemenId(Integer departemenId) { - this.departemenId = departemenId; - } + @NotNull(message = "Kd Ruangan tidak boleh kosong") + @Column(name = "KdRuangan", nullable = false, length = 3) + @Caption(value = "Kode Ruangan") + private String kdRuangan; - public Kelas getKelasHead() { - return kelasHead; - } + @Column(name = "LokasiRuangan", length = 50) + @Caption(value = "Lokasi Ruangan") + private String lokasiRuangan; - public void setKelasHead(Kelas kelasHead) { - this.kelasHead = kelasHead; - } + @Column(name = "MobilePhone", length = 30) + @Caption(value = "Mobile Phone") + private String mobilePhone; - public Integer getKelasHeadId() { - return kelasHeadId; - } + @NotNull(message = "Nama Ruangan tidak boleh kosong") + @Column(name = "NamaRuangan", nullable = false, length = 50) + @Caption(value = "Nama Ruangan") + private String namaRuangan; - public void setKelasHeadId(Integer kelasHeadId) { - this.kelasHeadId = kelasHeadId; - } + @Column(name = "NoCounter") + @Caption(value = "No Counter") + private Integer noCounter; - public ModulAplikasi getModulAplikasi() { - return modulAplikasi; - } + @Column(name = "NoRuangan", length = 4) + @Caption(value = "No Ruangan") + private String noRuangan; - public void setModulAplikasi(ModulAplikasi modulAplikasi) { - this.modulAplikasi = modulAplikasi; - } + @Column(name = "PrefixNoAntrian", length = 4) + @Caption(value = "Prefix No Antrian") + private String prefixNoAntrian; - public Integer getModulAplikasiId() { - return modulAplikasiId; - } + @NotNull(message = "QRuangan tidak boleh kosong") + @Column(name = "QRuangan", nullable = false) + @Caption(value = "QRuangan") + private short qRuangan; - public void setModulAplikasiId(Integer modulAplikasiId) { - this.modulAplikasiId = modulAplikasiId; - } + @Column(name = "StatusViewData") + @Caption(value = "Status View Data") + private Boolean statusViewData; - public Pegawai getPegawaiKepala() { - return pegawaiKepala; - } + @Column(name = "Website", length = 80) + @Caption(value = "Website") + private String website; - public void setPegawaiKepala(Pegawai pegawaiKepala) { - this.pegawaiKepala = pegawaiKepala; - } + @Column(name = "tanggal") + @Caption(value = "tanggal") + private Date tanggal; - public Integer getPegawaiKepalaId() { - return pegawaiKepalaId; - } + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "ObjectRuanganFk") + @Caption(value = "Object Ruangan") + private Ruangan headRuangan; - public void setPegawaiKepalaId(Integer pegawaiKepalaId) { - this.pegawaiKepalaId = pegawaiKepalaId; - } + @Column(name = "ObjectRuanganFk", insertable = false, updatable = false) + private Integer headRuanganId; - public String getKdRuangan() { - return kdRuangan; - } + @JsonBackReference + @OneToMany(cascade = CascadeType.ALL, fetch = LAZY, mappedBy = "ruangan") + Set kamarSet = new HashSet<>(); - public void setKdRuangan(String kdRuangan) { - this.kdRuangan = kdRuangan; - } - - public String getLokasiRuangan() { - return lokasiRuangan; - } - - public void setLokasiRuangan(String lokasiRuangan) { - this.lokasiRuangan = lokasiRuangan; - } - - public String getMobilePhone() { - return mobilePhone; - } - - public void setMobilePhone(String mobilePhone) { - this.mobilePhone = mobilePhone; - } - - public String getNamaRuangan() { - return namaRuangan; - } - - public void setNamaRuangan(String namaRuangan) { - this.namaRuangan = namaRuangan; - } - - public Integer getNoCounter() { - return noCounter; - } - - public void setNoCounter(Integer noCounter) { - this.noCounter = noCounter; - } - - public String getNoRuangan() { - return noRuangan; - } - - public void setNoRuangan(String noRuangan) { - this.noRuangan = noRuangan; - } - - public String getPrefixNoAntrian() { - return prefixNoAntrian; - } - - public void setPrefixNoAntrian(String prefixNoAntrian) { - this.prefixNoAntrian = prefixNoAntrian; - } - - public short getqRuangan() { - return qRuangan; - } - - public void setqRuangan(short qRuangan) { - this.qRuangan = qRuangan; - } - - public Boolean getStatusViewData() { - return statusViewData; - } - - public void setStatusViewData(Boolean statusViewData) { - this.statusViewData = statusViewData; - } - - public String getWebsite() { - return website; - } - - public void setWebsite(String website) { - this.website = website; - } - - public Date getTanggal() { - return tanggal; - } - - public void setTanggal(Date tanggal) { - this.tanggal = tanggal; - } - - public Ruangan getHeadRuangan() { - return headRuangan; - } - - public void setHeadRuangan(Ruangan headRuangan) { - this.headRuangan = headRuangan; - } - - public Integer getHeadRuanganId() { - return headRuanganId; - } - - public void setHeadRuanganId(Integer headRuanganId) { - this.headRuanganId = headRuanganId; - } - - public Set getKamarSet() { - return kamarSet; - } - - public void setKamarSet(Set kamarSet) { - this.kamarSet = kamarSet; - } - - public UnitKerjaPegawai getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(UnitKerjaPegawai unitKerja) { - this.unitKerja = unitKerja; - } - - public Integer getUnitKerjaId() { - return unitKerjaId; - } - - public void setUnitKerjaId(Integer unitKerjaId) { - this.unitKerjaId = unitKerjaId; - } - @Override public String toString() { return "Ruangan [id=" + id + ", namaRuangan=" + namaRuangan + ", statusEnabled=" + statusEnabled + "]"; } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsalProdukVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsalProdukVO.java index d053ce46..f1584b89 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsalProdukVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsalProdukVO.java @@ -1,170 +1,37 @@ package com.jasamedika.medifirst2000.vo; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -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; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Column; /** - * class AsalProduk + * class AsalProduk * * @author Generator */ -//@Entity -//@Table(name = "AsalProduk_M") +@Getter +@Setter public class AsalProdukVO extends BaseMasterVO { - @Caption(value="Asal Produk") + @Caption(value = "Asal Produk") private String asalProduk; - public void setAsalProduk(String asalProduk) { - this.asalProduk = asalProduk; - } - - @Column(name = "AsalProduk", nullable = false , length = 30) - public String getAsalProduk(){ - return this.asalProduk; - } - - @Caption(value="Kode Asal Produk") + @Caption(value = "Kode Asal Produk") private Byte kdAsalProduk; - @Column(name = "QAsalProduk", nullable = false ) - public Byte getKdAsalProduk() { - return kdAsalProduk; - } - - public void setKdAsalProduk(Byte kdAsalProduk) { - this.kdAsalProduk = kdAsalProduk; - } - - @ManyToOne - @JoinColumn(name = "ObjectDepartemenFk") - @NotNull(message="Object DepartemenVO Harus Diisi") - @Caption(value="Object Departemen") + @Caption(value = "Object Departemen") private DepartemenVO departemen; - public void setDepartemen(DepartemenVO departemen) { - this.departemen = departemen; - } - - @Column(name = "KdDepartemen", nullable = false , length = 1) - public DepartemenVO getDepartemen(){ - return this.departemen; - } - - @Column(name = "ObjectDepartemenFk", insertable=false,updatable=false) + @Column(name = "ObjectDepartemenFk", insertable = false, updatable = false) private Integer departemenId; - - public Integer getDepartemenId() { - return departemenId; - } - - public void setDepartemenId(Integer departemenId) { - this.departemenId = departemenId; - } - - @ManyToOne - @JoinColumn(name = "ObjectKelompokProdukFk") - @Caption(value="Object Kelompok Produk") + @Caption(value = "Object Kelompok Produk") private KelompokProdukVO kelompokProduk; - public void setKelompokProduk(KelompokProdukVO kelompokProduk) { - this.kelompokProduk = kelompokProduk; - } - - @Column(name = "KdKelompokProduk", nullable = true ) - public KelompokProdukVO getKelompokProduk(){ - return this.kelompokProduk; - } - - @Column(name = "ObjectKelompokProdukFk", insertable=false,updatable=false) private Integer kelompokProdukId; - - - public Integer getKelompokProdukId() { - return kelompokProdukId; - } - - public void setKelompokProdukId(Integer kelompokProdukId) { - this.kelompokProdukId = kelompokProdukId; - } - - @Caption(value="QAsal Produk") + @Caption(value = "QAsal Produk") private Byte qAsalProduk; - - public Byte getqAsalProduk() { - return qAsalProduk; - } - - public void setqAsalProduk(Byte qAsalProduk) { - this.qAsalProduk = qAsalProduk; - } - - - - - /*// - @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk") - private Set HargaNettoDiscPasienPulangSet = new HashSet(); - - public Set getHargaNettoDiscPasienPulangSet() { - return HargaNettoDiscPasienPulangSet; - } - - public void setHargaNettoDiscPasienPulangSet(Set hargaNettoDiscPasienPulangSet) { - HargaNettoDiscPasienPulangSet = hargaNettoDiscPasienPulangSet; - } - - // - @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk") - private Set HargaNettoProdukByKelasSet = new HashSet(); - - public Set getHargaNettoProdukByKelasSet() { - return HargaNettoProdukByKelasSet; - } - - public void setHargaNettoProdukByKelasSet(Set hargaNettoProdukByKelasSet) { - HargaNettoProdukByKelasSet = hargaNettoProdukByKelasSet; - } - - // - @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk") - private Set HargaNettoProdukByKelasDSet = new HashSet(); - - public Set getHargaNettoProdukByKelasDSet() { - return HargaNettoProdukByKelasDSet; - } - - public void setHargaNettoProdukByKelasDSet(Set hargaNettoProdukByKelasDSet) { - HargaNettoProdukByKelasDSet = hargaNettoProdukByKelasDSet; - }*/ - - /*// - @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdasalproduk") - private Set HargaNettoProdukByTerimaSet = new HashSet(); - - public Set getHargaNettoProdukByTerimaSet() { - return HargaNettoProdukByTerimaSet; - } - - public void setHargaNettoProdukByTerimaSet(Set hargaNettoProdukByTerimaSet) { - HargaNettoProdukByTerimaSet = hargaNettoProdukByTerimaSet; - }*/ - - } - diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisPetugasPelaksanaVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisPetugasPelaksanaVO.java index 428ac970..e40302a9 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisPetugasPelaksanaVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/JenisPetugasPelaksanaVO.java @@ -1,80 +1,29 @@ package com.jasamedika.medifirst2000.vo; -import java.io.Serializable; -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; +import lombok.Getter; +import lombok.Setter; /** - * class JenisPetugasPelaksana + * class JenisPetugasPelaksana * * @author Generator */ -//@Entity -//@Table(name = "JenisPetugasPelaksana_M") +@Getter +@Setter public class JenisPetugasPelaksanaVO extends BaseMasterVO { - @Caption(value="Jenis Petugas Pe") + @Caption(value = "Jenis Petugas Pe") private String jenisPetugasPe; - public void setJenisPetugasPe(String jenisPetugasPe) { - this.jenisPetugasPe = jenisPetugasPe; - } - - @Column(name = "JenisPetugasPe", nullable = false , length = 50) - public String getJenisPetugasPe(){ - return this.jenisPetugasPe; - } - - @Caption(value="Kode Jenis Petugas Pe") + @Caption(value = "Kode Jenis Petugas Pe") private Byte kdJenisPetugasPe; - public void setKdJenisPetugasPe(Byte kdJenisPetugasPe) { - this.kdJenisPetugasPe = kdJenisPetugasPe; - } - - @Column(name = "KdJenisPetugasPe", nullable = false ) - public Byte getKdJenisPetugasPe(){ - return this.kdJenisPetugasPe; - } - - @ManyToOne - @JoinColumn(name = "ObjectKomponenHargaFk") - @Caption(value="Object Komponen Harga") + @Caption(value = "Object Komponen Harga") private KomponenHargaVO komponenHarga; - public void setKomponenHarga(KomponenHargaVO komponenHarga) { - this.komponenHarga = komponenHarga; - } - - @Column(name = "KdKomponenHarga", nullable = true ) - public KomponenHargaVO getKomponenHarga(){ - return this.komponenHarga; - } - - @Column(name = "ObjectKomponenHargaFk", insertable=false,updatable=false) private Integer komponenHargaId; - @Caption(value="QJenis Petugas Pe") + @Caption(value = "QJenis Petugas Pe") private Byte qJenisPetugasPe; - - public void setqJenisPetugasPe(Byte qJenisPetugasPe) { - this.qJenisPetugasPe = qJenisPetugasPe; - } - - @Column(name = "QJenisPetugasPe", nullable = false ) - public Byte getqJenisPetugasPe(){ - return this.qJenisPetugasPe; - } - - } - diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java new file mode 100644 index 00000000..8c28bc1a --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiJabatanVO.java @@ -0,0 +1,27 @@ +package com.jasamedika.medifirst2000.vo; + +import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.entities.Jabatan; +import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai; +import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * class Pegawai + * + * @author salmanoe + */ +@Getter +@Setter +@NoArgsConstructor +public class PegawaiJabatanVO extends BaseMasterVO { + private Jabatan jabatanInternal; + private SubUnitKerjaPegawai unitKerja; + private UnitKerjaPegawai unitKerjaPegawai; + private Boolean isCanCreateJadwal; + private Boolean isPrimary; + private Boolean statusEnabled; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO.java index 9013e92a..f189dd09 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO.java @@ -4,1587 +4,336 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -//import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + /** * class Pegawai * * @author Generator */ -// @Entity -// @Table(name = "Pegawai_M") +@Getter +@Setter public class PegawaiVO extends BaseMasterVO { - @Column(name = "IdFinger", nullable = true, length = 100) @Caption(value = "IdFinger") private String idFinger; - - - public String getIdFinger() { - return idFinger; - } - public void setIdFinger(String idFinger) { - this.idFinger = idFinger; - } - @Column(name = "Nip", nullable = true, length = 100) @Caption(value = "Nip") private String nip; - public String getNip() { - return nip; - } - - public void setNip(String nip) { - this.nip = nip; - } - - @Column(name = "Nama", nullable = true, length = 100) @Caption(value = "Nama") private String nama; - public String getNama() { - return nama; - } - - public void setNama(String nama) { - this.nama = nama; - } - - @Column(name = "TanggalLahir", nullable = true, length = 100) @Caption(value = "TanggalLahir") private Date tanggalLahir; - public Date getTanggalLahir() { - return tanggalLahir; - } - - public void setTanggalLahir(Date tanggalLahir) { - this.tanggalLahir = tanggalLahir; - } - - @ManyToOne - @JoinColumn(name = "KedudukanFk") - //@NotNull(message = "Kedudukan Harus Diisi") @Caption(value = "Kedudukan") private KedudukanVO kedudukan; - public KedudukanVO getKedudukan() { - return kedudukan; - } - - public void setKedudukan(KedudukanVO kedudukan) { - this.kedudukan = kedudukan; - } - - @Column(name = "KedudukanFk", insertable = false, updatable = false) private String kedudukanId; - @Column(name = "TanggalMeninggal", nullable = true, length = 100) @Caption(value = "TanggalMeninggal") private Date tanggalMeninggal; - public Date getTanggalMeninggal() { - return tanggalMeninggal; - } - - public void setTanggalMeninggal(Date tanggalMeninggal) { - this.tanggalMeninggal = tanggalMeninggal; - } - - /*@ManyToOne - @JoinColumn(name = "KodeGapokFk") - @NotNull(message = "Kode Gapok Harus Diisi") - @Caption(value = "Kode Gapok") - private GajiPokokVO kodeGapok; - - public GajiPokokVO getKodeGapok() { - return kodeGapok; - } - - public void setKodeGapok(GajiPokokVO kodeGapok) { - this.kodeGapok = kodeGapok; - }*/ - - @Column(name = "KodeGapokFk", insertable = false, updatable = false) private String kodeGapokId; - + private Date tglPensiun; - @ManyToOne - @JoinColumn(name = "ObjectGolonganFk") - //@NotNull(message = "Golongan Harus Diisi") @Caption(value = "Golongan") private GolonganVO Golongan; - public GolonganVO getGolongan() { - return Golongan; - } - - public void setGolongan(GolonganVO Golongan) { - this.Golongan = Golongan; - } - - @Column(name = "ObjectGolonganFk", insertable = false, updatable = false) private Integer GolonganId; - @Column(name = "Jabatan", nullable = true, length = 100) @Caption(value = "Jabatan") private String Jabatan; - public String getJabatan() { - return Jabatan; - } - - public void setJabatan(String Jabatan) { - this.Jabatan = Jabatan; - } - - @Column(name = "Pensiun", nullable = true, length = 100) @Caption(value = "Pensiun") private Integer pensiun; - public Integer getPensiun() { - return pensiun; - } - - public void setPensiun(Integer pensiun) { - this.pensiun = pensiun; - } - - @Column(name = "TunjanganFungsional", nullable = true, length = 100) @Caption(value = "TunjanganFungsional") private String tunjanganFungsional; - public String getTunjanganFungsional() { - return tunjanganFungsional; - } - - public void setTunjanganFungsional(String tunjanganFungsional) { - this.tunjanganFungsional = tunjanganFungsional; - } - - @Column(name = "TunjanganPapua", nullable = true, length = 100) @Caption(value = "TunjanganPapua") private Integer tunjanganPapua; - public Integer getTunjanganPapua() { - return tunjanganPapua; - } - - public void setTunjanganPapua(Integer tunjanganPapua) { - this.tunjanganPapua = tunjanganPapua; - } - - @Column(name = "WilayahTerperinci", nullable = true, length = 100) @Caption(value = "WilayahTerperinci") private Integer wilayahTerperinci; - public Integer getWilayahTerperinci() { - return wilayahTerperinci; - } - - public void setWilayahTerperinci(Integer wilayahTerperinci) { - this.wilayahTerperinci = wilayahTerperinci; - } - - @Column(name = "TunjanganUmum", nullable = true, length = 100) @Caption(value = "TunjanganUmum") private Integer tunjanganUmum; - public Integer getTunjanganUmum() { - return tunjanganUmum; - } - - public void setTunjanganUmum(Integer tunjanganUmum) { - this.tunjanganUmum = tunjanganUmum; - } - - @ManyToOne - @JoinColumn(name = "StatusKawinFk") - //@NotNull(message = "Status Kawin Harus Diisi") @Caption(value = "Status Kawin") private StatusPerkawinanVO statusKawin; - public StatusPerkawinanVO getStatusKawin() { - return statusKawin; - } - - public void setStatusKawin(StatusPerkawinanVO statusKawin) { - this.statusKawin = statusKawin; - } - - @Column(name = "StatusKawinFk", insertable = false, updatable = false) private String statusKawinId; - @Column(name = "Beras", nullable = true, length = 100) @Caption(value = "Beras") private String beras; - public String getBeras() { - return beras; - } - - public void setBeras(String beras) { - this.beras = beras; - } - - @Column(name = "SewaRumah", nullable = true, length = 100) @Caption(value = "SewaRumah") private String sewaRumah; - public String getSewaRumah() { - return sewaRumah; - } - - public void setSewaRumah(String sewaRumah) { - this.sewaRumah = sewaRumah; - } - - @Column(name = "NomorRekening", nullable = true, length = 100) @Caption(value = "NomorRekening") private String nomorRekening; - public String getNomorRekening() { - return nomorRekening; - } - - public void setNomorRekening(String nomorRekening) { - this.nomorRekening = nomorRekening; - } - - @Column(name = "NamaRekening", nullable = true, length = 100) @Caption(value = "NamaRekening") private String namaRekening; - public String getNamaRekening() { - return namaRekening; - } - - public void setNamaRekening(String namaRekening) { - this.namaRekening = namaRekening; - } - - @Column(name = "KodeBank", nullable = true, length = 100) @Caption(value = "KodeBank") private String kodeBank; - public String getKodeBank() { - return kodeBank; - } - - public void setKodeBank(String kodeBank) { - this.kodeBank = kodeBank; - } - - @Column(name = "Alamat", nullable = true, length = 100) @Caption(value = "Alamat") private String alamat; - public String getAlamat() { - return alamat; - } - - public void setAlamat(String alamat) { - this.alamat = alamat; - } - - @Column(name = "KodePos", nullable = true, length = 100) @Caption(value = "KodePos") private String kodePos; - public String getKodePos() { - return kodePos; - } - - public void setKodePos(String kodePos) { - this.kodePos = kodePos; - } - @Caption(value = "Bank Rekening Atas Nama") private String bankRekeningAtasNama; - public String getBankRekeningAtasNama() { - return bankRekeningAtasNama; - } - - @Column(name = "BankRekeningAtasNama", nullable = true, length = 75) - public void setBankRekeningAtasNama(String bankRekeningAtasNama) { - this.bankRekeningAtasNama = bankRekeningAtasNama; - } - @Caption(value = "Bank Rekening Nama") private String bankRekeningNama; - @Column(name = "BankRekeningNama", nullable = true, length = 50) - public String getBankRekeningNama() { - return bankRekeningNama; - } - - public void setBankRekeningNama(String bankRekeningNama) { - this.bankRekeningNama = bankRekeningNama; - } - @Caption(value = "Bank Rekening Nomor") private String bankRekeningNomor; - @Column(name = "BankRekeningNomor", nullable = true, length = 30) - public String getBankRekeningNomor() { - return bankRekeningNomor; - } - - public void setBankRekeningNomor(String bankRekeningNomor) { - this.bankRekeningNomor = bankRekeningNomor; - } - @Caption(value = "Finger Print I D") private String fingerPrintId; - @Column(name = "FingerPrintID", nullable = true, length = 50) - public String getFingerPrintId() { - return fingerPrintId; - } - - public void setFingerPrintId(String fingerPrintId) { - this.fingerPrintId = fingerPrintId; - } - - @ManyToOne - @JoinColumn(name = "ObjectAgamaFk") @Caption(value = "Object Agama") private AgamaVO agama; - public AgamaVO getAgama() { - return agama; - } - - public void setAgama(AgamaVO agama) { - this.agama = agama; - } - - @Column(name = "ObjectAgamaFk", insertable = false, updatable = false) private Integer agamaId; - @ManyToOne - @JoinColumn(name = "ObjectDetailKategoryPegawaiFk") @Caption(value = "Object Detail Kategory Pegawai") private DetailKategoryPegawaiVO detailKategoryPegawai; - @Column(name = "KdDetailKategoryPegawai", nullable = true, length = 2) - public DetailKategoryPegawaiVO getDetailKategoryPegawai() { - return detailKategoryPegawai; - } - - public void setDetailKategoryPegawai(DetailKategoryPegawaiVO detailKategoryPegawai) { - this.detailKategoryPegawai = detailKategoryPegawai; - } - - @Column(name = "ObjectDetailKategoryPegawaiFk", insertable = false, updatable = false) private Integer detailKategoryPegawaiId; - @ManyToOne - @JoinColumn(name = "ObjectDokumenSuratLamarFk") @Caption(value = "Object DokumenVO Surat Lamar") private DokumenVO dokumen; - @Column(name = "KdDokumenSuratLamar", nullable = true) - public DokumenVO getDokumen() { - return dokumen; - } - - public void setDokumen(DokumenVO dokumen) { - this.dokumen = dokumen; - } - - @Column(name = "ObjectDokumenSuratLamarFk", insertable = false, updatable = false) private Integer dokumenId; - @ManyToOne - @JoinColumn(name = "ObjectEselonFk") @Caption(value = "Object Eselon") private EselonVO eselon; - @Column(name = "KdEselon", nullable = true) - public EselonVO getEselon() { - return eselon; - } - - public void setEselon(EselonVO eselon) { - this.eselon = eselon; - } - - @Column(name = "ObjectEselonFk", insertable = false, updatable = false) private Integer eselonId; - @ManyToOne - @JoinColumn(name = "ObjectGolonganDarahFk") @Caption(value = "Object Golongan Darah") private GolonganDarahVO golonganDarah; - @Column(name = "KdGolonganDarah", nullable = true) - public GolonganDarahVO getGolonganDarah() { - return golonganDarah; - } - - public void setGolonganDarah(GolonganDarahVO golonganDarah) { - this.golonganDarah = golonganDarah; - } - - @Column(name = "ObjectGolonganDarahFk", insertable = false, updatable = false) private Integer golonganDarahId; - @ManyToOne - @JoinColumn(name = "ObjectJabatanFungsionalFk") @Caption(value = "Object JabatanVO Fungsional") private JabatanVO jabatanFungsional; - @Column(name = "ObjectJabatanFungsionalFk", insertable = false, updatable = false) - public JabatanVO getJabatanFungsional() { - return jabatanFungsional; - } - - public void setJabatanFungsional(JabatanVO jabatanFungsional) { - this.jabatanFungsional = jabatanFungsional; - } - - @Column(name = "ObjectJabatanFungsionalFk", insertable = false, updatable = false) private Integer jabatanFungsionalId; - @ManyToOne - @JoinColumn(name = "ObjectJabatanLamarFk") @Caption(value = "Object JabatanVO Lamar") private JabatanVO jabatanLamar; - public JabatanVO getJabatanLamar() { - return jabatanLamar; - } - - public void setJabatanLamar(JabatanVO jabatanLamar) { - this.jabatanLamar = jabatanLamar; - } - private KelompokShiftVO shiftKerja; - public KelompokShiftVO getShiftKerja() { - return shiftKerja; - } - - public void setShiftKerja(KelompokShiftVO shiftKerja) { - this.shiftKerja = shiftKerja; - } - - @Column(name = "ObjectShiftKerja", insertable = false, updatable = false, nullable = true) private Integer shiftKerjaId; - @Column(name = "ObjectJabatanLamarFk", insertable = false, updatable = false) private Integer jabatanLamarId; - @ManyToOne - @JoinColumn(name = "ObjectJabatanStrukturalFk") @Caption(value = "Object JabatanVO Struktural") private JabatanVO jabatanStruktural; - -// @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "pegawai") -// private Set mapPegawaiJabatanToUnitKerja = new HashSet(); - public String getKedudukanId() { - return kedudukanId; - } - - public void setKedudukanId(String kedudukanId) { - this.kedudukanId = kedudukanId; - } - - public String getKodeGapokId() { - return kodeGapokId; - } - - public void setKodeGapokId(String kodeGapokId) { - this.kodeGapokId = kodeGapokId; - } - - public Integer getGolonganId() { - return GolonganId; - } - - public void setGolonganId(Integer golonganId) { - GolonganId = golonganId; - } - - public String getStatusKawinId() { - return statusKawinId; - } - - public void setStatusKawinId(String statusKawinId) { - this.statusKawinId = statusKawinId; - } - - public Integer getAgamaId() { - return agamaId; - } - - public void setAgamaId(Integer agamaId) { - this.agamaId = agamaId; - } - - public Integer getDetailKategoryPegawaiId() { - return detailKategoryPegawaiId; - } - - public void setDetailKategoryPegawaiId(Integer detailKategoryPegawaiId) { - this.detailKategoryPegawaiId = detailKategoryPegawaiId; - } - - public Integer getDokumenId() { - return dokumenId; - } - - public void setDokumenId(Integer dokumenId) { - this.dokumenId = dokumenId; - } - - public Integer getEselonId() { - return eselonId; - } - - public void setEselonId(Integer eselonId) { - this.eselonId = eselonId; - } - - public Integer getGolonganDarahId() { - return golonganDarahId; - } - - public void setGolonganDarahId(Integer golonganDarahId) { - this.golonganDarahId = golonganDarahId; - } - - public Integer getJabatanFungsionalId() { - return jabatanFungsionalId; - } - - public void setJabatanFungsionalId(Integer jabatanFungsionalId) { - this.jabatanFungsionalId = jabatanFungsionalId; - } - - public Integer getShiftKerjaId() { - return shiftKerjaId; - } - - public void setShiftKerjaId(Integer shiftKerjaId) { - this.shiftKerjaId = shiftKerjaId; - } - - public Integer getJabatanLamarId() { - return jabatanLamarId; - } - - public void setJabatanLamarId(Integer jabatanLamarId) { - this.jabatanLamarId = jabatanLamarId; - } - - public Integer getJabatanStrukturalId() { - return jabatanStrukturalId; - } - - public void setJabatanStrukturalId(Integer jabatanStrukturalId) { - this.jabatanStrukturalId = jabatanStrukturalId; - } - - public Integer getJenisKelaminId() { - return jenisKelaminId; - } - - public void setJenisKelaminId(Integer jenisKelaminId) { - this.jenisKelaminId = jenisKelaminId; - } - - public Integer getJenisPegawaiId() { - return jenisPegawaiId; - } - - public void setJenisPegawaiId(Integer jenisPegawaiId) { - this.jenisPegawaiId = jenisPegawaiId; - } - - public Integer getJenisPegawaiLamarId() { - return jenisPegawaiLamarId; - } - - public void setJenisPegawaiLamarId(Integer jenisPegawaiLamarId) { - this.jenisPegawaiLamarId = jenisPegawaiLamarId; - } - - public Integer getKualifikasiJurusanId() { - return kualifikasiJurusanId; - } - - public void setKualifikasiJurusanId(Integer kualifikasiJurusanId) { - this.kualifikasiJurusanId = kualifikasiJurusanId; - } - - public Integer getNegaraId() { - return negaraId; - } - - public void setNegaraId(Integer negaraId) { - this.negaraId = negaraId; - } - - public Integer getPangkatId() { - return pangkatId; - } - - public void setPangkatId(Integer pangkatId) { - this.pangkatId = pangkatId; - } - - public Integer getLoginUserId() { - return loginUserId; - } - - public void setLoginUserId(Integer loginUserId) { - this.loginUserId = loginUserId; - } - - public Integer getLoginUserAtasanId() { - return loginUserAtasanId; - } - - public void setLoginUserAtasanId(Integer loginUserAtasanId) { - this.loginUserAtasanId = loginUserAtasanId; - } - - public Integer getLoginUserPembimbingId() { - return loginUserPembimbingId; - } - - public void setLoginUserPembimbingId(Integer loginUserPembimbingId) { - this.loginUserPembimbingId = loginUserPembimbingId; - } - - public Integer getPendidikanId() { - return pendidikanId; - } - - public void setPendidikanId(Integer pendidikanId) { - this.pendidikanId = pendidikanId; - } - - public Integer getPenghasilanTidakKenaPajakId() { - return penghasilanTidakKenaPajakId; - } - - public void setPenghasilanTidakKenaPajakId(Integer penghasilanTidakKenaPajakId) { - this.penghasilanTidakKenaPajakId = penghasilanTidakKenaPajakId; - } - - public Integer getRangeId() { - return rangeId; - } - - public void setRangeId(Integer rangeId) { - this.rangeId = rangeId; - } - - public Integer getRuanganId() { - return ruanganId; - } - - public void setRuanganId(Integer ruanganId) { - this.ruanganId = ruanganId; - } - - public Integer getStatusPegawaiId() { - return statusPegawaiId; - } - - public void setStatusPegawaiId(Integer statusPegawaiId) { - this.statusPegawaiId = statusPegawaiId; - } - - public Integer getStattusPerkawinanId() { - return stattusPerkawinanId; - } - - public void setStattusPerkawinanId(Integer stattusPerkawinanId) { - this.stattusPerkawinanId = stattusPerkawinanId; - } - - public Integer getSukuId() { - return sukuId; - } - - public void setSukuId(Integer sukuId) { - this.sukuId = sukuId; - } - - public Integer getTitlePasienId() { - return titlePasienId; - } - - public void setTitlePasienId(Integer titlePasienId) { - this.titlePasienId = titlePasienId; - } - - public Integer getTypePegawaiId() { - return typePegawaiId; - } - - public void setTypePegawaiId(Integer typePegawaiId) { - this.typePegawaiId = typePegawaiId; - } - - public Integer getNoStruk_TTujuanLastId() { - return noStruk_TTujuanLastId; - } - - public void setNoStruk_TTujuanLastId(Integer noStruk_TTujuanLastId) { - this.noStruk_TTujuanLastId = noStruk_TTujuanLastId; - } - - public Integer getSatuanKerjaId() { - return satuanKerjaId; - } - - public void setSatuanKerjaId(Integer satuanKerjaId) { - this.satuanKerjaId = satuanKerjaId; - } - - public JabatanVO getJabatanInternal() { - return jabatanInternal; - } - - public void setJabatanInternal(JabatanVO jabatanInternal) { - this.jabatanInternal = jabatanInternal; - } - - public Integer getJabatanInternalId() { - return jabatanInternalId; - } - - public void setJabatanInternalId(Integer jabatanInternalId) { - this.jabatanInternalId = jabatanInternalId; - } - - @Column(name = "KdJabatanStruktural", nullable = true, length = 2) - public JabatanVO getJabatanStruktural() { - return jabatanStruktural; - } - - public void setJabatanStruktural(JabatanVO jabatanStruktural) { - this.jabatanStruktural = jabatanStruktural; - } - - @Column(name = "ObjectJabatanStrukturalFk", insertable = false, updatable = false) private Integer jabatanStrukturalId; - @ManyToOne - @JoinColumn(name = "ObjectJenisKelaminFk") - //@NotNull(message = "Object Jenis Kelamin Harus Diisi") @Caption(value = "Object Jenis Kelamin") private JenisKelaminVO jenisKelamin; - @Column(name = "KdJenisKelamin", nullable = true) - public JenisKelaminVO getJenisKelamin() { - return jenisKelamin; - } - - public void setJenisKelamin(JenisKelaminVO jenisKelamin) { - this.jenisKelamin = jenisKelamin; - } - - @Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false) private Integer jenisKelaminId; - @ManyToOne - @JoinColumn(name = "ObjectJenisPegawaiFk") - @Caption(value = "Object Jenis Pegawai") private JenisPegawaiVO jenisPegawai; - public JenisPegawaiVO getJenisPegawai() { - return jenisPegawai; - } - - public void setJenisPegawai(JenisPegawaiVO jenisPegawai) { - this.jenisPegawai = jenisPegawai; - } - - @Column(name = "ObjectJenisPegawaiFk", insertable = false, updatable = false, nullable = true) private Integer jenisPegawaiId; - @ManyToOne - @JoinColumn(name = "ObjectJenisPegawaiLamarFk") @Caption(value = "Object Jenis PegawaiVO Lamar") private JenisPegawaiVO jenisPegawaiLamar; - @Column(name = "KdJenisPegawaiLamar", nullable = true, length = 2) - public JenisPegawaiVO getJenisPegawaiLamar() { - return jenisPegawaiLamar; - } - - public void setJenisPegawaiLamar(JenisPegawaiVO jenisPegawaiLamar) { - this.jenisPegawaiLamar = jenisPegawaiLamar; - } - - @Column(name = "ObjectJenisPegawaiLamarFk", insertable = false, updatable = false) private Integer jenisPegawaiLamarId; - @ManyToOne - @JoinColumn(name = "ObjectKualifikasiJurusanFk") @Caption(value = "Object Kualifikasi Jurusan") private KualifikasiJurusanVO kualifikasiJurusan; - @Column(name = "KdKualifikasiJurusan", nullable = true, length = 4) - public KualifikasiJurusanVO getKualifikasiJurusan() { - return kualifikasiJurusan; - } - - public void setKualifikasiJurusan(KualifikasiJurusanVO kualifikasiJurusan) { - this.kualifikasiJurusan = kualifikasiJurusan; - } - - @Column(name = "ObjectKualifikasiJurusanFk", insertable = false, updatable = false) private Integer kualifikasiJurusanId; - @ManyToOne - @JoinColumn(name = "ObjectNegaraFk") - @Caption(value = "Object Negara") private NegaraVO negara; - @Column(name = "KdNegara", nullable = true) - public NegaraVO getNegara() { - return negara; - } - - public void setNegara(NegaraVO negara) { - this.negara = negara; - } - - @Column(name = "ObjectNegaraFk", insertable = false, updatable = false, nullable = true) private Integer negaraId; - @ManyToOne - @JoinColumn(name = "ObjectPangkatFk") @Caption(value = "Object Pangkat") private PangkatVO pangkat; - @Column(name = "KdPangkat", nullable = true) - public PangkatVO getPangkat() { - return pangkat; - } - - public void setPangkat(PangkatVO pangkat) { - this.pangkat = pangkat; - } - - @Column(name = "ObjectPangkatFk", insertable = false, updatable = false) private Integer pangkatId; - @ManyToOne - @JoinColumn(name = "ObjectPegawaiFk") - @Caption(value = "Object Pegawai") private LoginUserVO loginUser; - @Column(name = "KdPegawai", nullable = true, length = 5) - public LoginUserVO getLoginUser() { - return loginUser; - } - - public void setLoginUser(LoginUserVO loginUser) { - this.loginUser = loginUser; - } - - @Column(name = "ObjectPegawaiFk", insertable = false, updatable = false, nullable = true) private Integer loginUserId; - @ManyToOne - @JoinColumn(name = "ObjectPegawaiAtasanFk") @Caption(value = "Object PegawaiVO Atasan") private LoginUserVO loginUserAtasan; - @Column(name = "KdPegawaiAtasan", nullable = true, length = 5) - public LoginUserVO getLoginUserAtasan() { - return loginUserAtasan; - } - - public void setLoginUserAtasan(LoginUserVO loginUserAtasan) { - this.loginUserAtasan = loginUserAtasan; - } - - @Column(name = "ObjectPegawaiAtasanFk", insertable = false, updatable = false) private Integer loginUserAtasanId; - @ManyToOne - @JoinColumn(name = "ObjectPegawaiPembimbingFk") @Caption(value = "Object PegawaiVO Pembimbing") private LoginUserVO loginUserPembimbing; - @Column(name = "KdPegawaiPembimbing", nullable = true, length = 5) - public LoginUserVO getLoginUserPembimbing() { - return loginUserPembimbing; - } - - public void setLoginUserPembimbing(LoginUserVO loginUserPembimbing) { - this.loginUserPembimbing = loginUserPembimbing; - } - - @Column(name = "ObjectPegawaiPembimbingFk", insertable = false, updatable = false) private Integer loginUserPembimbingId; - @ManyToOne - @JoinColumn(name = "ObjectPendidikanTerakhirFk") @Caption(value = "Object PendidikanVO Terakhir") private PendidikanVO pendidikan; - @Column(name = "KdPendidikanTerakhir", nullable = true, length = 2) - public PendidikanVO getPendidikan() { - return pendidikan; - } - - public void setPendidikan(PendidikanVO pendidikan) { - this.pendidikan = pendidikan; - } - - @Column(name = "ObjectPendidikanTerakhirFk", insertable = false, updatable = false) private Integer pendidikanId; - @ManyToOne - @JoinColumn(name = "ObjectPTKPFk") @Caption(value = "Object P T K P") private PenghasilanTidakKenaPajakVO penghasilanTidakKenaPajak; - @Column(name = "KdPTKP", nullable = true) - public PenghasilanTidakKenaPajakVO getPenghasilanTidakKenaPajak() { - return penghasilanTidakKenaPajak; - } - - public void setPenghasilanTidakKenaPajak(PenghasilanTidakKenaPajakVO penghasilanTidakKenaPajak) { - this.penghasilanTidakKenaPajak = penghasilanTidakKenaPajak; - } - - @Column(name = "ObjectPTKPFk", insertable = false, updatable = false) private Integer penghasilanTidakKenaPajakId; - @ManyToOne - @JoinColumn(name = "ObjectRangeTotalNilaiScoreFk") @Caption(value = "Object RangeVO Total Nilai Score") private RangeVO range; - @Column(name = "KdRangeTotalNilaiScore", nullable = true) - public RangeVO getRange() { - return range; - } - - public void setRange(RangeVO range) { - this.range = range; - } - - @Column(name = "ObjectRangeTotalNilaiScoreFk", insertable = false, updatable = false) private Integer rangeId; - @ManyToOne - @JoinColumn(name = "ObjectRuanganKerjaFk") @Caption(value = "Object RuanganVO Kerja") private RuanganVO ruangan; - @Column(name = "KdRuanganKerja", nullable = true, length = 3) - public RuanganVO getRuangan() { - return ruangan; - } - - public void setRuangan(RuanganVO ruangan) { - this.ruangan = ruangan; - } - - @Column(name = "ObjectRuanganKerjaFk", insertable = false, updatable = false) private Integer ruanganId; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "KategoryPegawai") @Caption(value = "Object Status Pegawai") private KategoryPegawaiVO kategoryPegawai; - public KategoryPegawaiVO getKategoryPegawai() { - return kategoryPegawai; - } - - public void setKategoryPegawai(KategoryPegawaiVO kategoryPegawai) { - this.kategoryPegawai = kategoryPegawai; - } - - @ManyToOne - @JoinColumn(name = "ObjectStatusPegawaiFk") @Caption(value = "Object Status Pegawai") private StatusPegawaiVO statusPegawai; - @Column(name = "KdStatusPegawai", nullable = true) - public StatusPegawaiVO getStatusPegawai() { - return statusPegawai; - } - - public void setStatusPegawai(StatusPegawaiVO statusPegawai) { - this.statusPegawai = statusPegawai; - } - - @Column(name = "ObjectStatusPegawaiFk", insertable = false, updatable = false) private Integer statusPegawaiId; - @ManyToOne - @JoinColumn(name = "ObjectStatusPerkawinanFk") @Caption(value = "Object Status Perkawinan") private StatusPerkawinanVO statusPerkawinan; - @Column(name = "KdStatusPerkawinan", nullable = true) - public StatusPerkawinanVO getStatusPerkawinan() { - return statusPerkawinan; - } - - public void setStatusPerkawinan(StatusPerkawinanVO statusPerkawinan) { - this.statusPerkawinan = statusPerkawinan; - } - - @Column(name = "ObjectStatusPerkawinanFk", insertable = false, updatable = false) private Integer stattusPerkawinanId; - @ManyToOne - @JoinColumn(name = "ObjectSukuFk") @Caption(value = "Object Suku") private SukuVO suku; - @Column(name = "KdSuku", nullable = true) - public SukuVO getSuku() { - return suku; - } - - public void setSuku(SukuVO suku) { - this.suku = suku; - } - - @Column(name = "ObjectSukuFk", insertable = false, updatable = false) private Integer sukuId; - @ManyToOne - @JoinColumn(name = "ObjectTitleFk") @Caption(value = "Object Title") private TitlePasienVO titlePasien; - public TitlePasienVO getTitlePasien() { - return titlePasien; - } - - public void setTitlePasien(TitlePasienVO titlePasien) { - this.titlePasien = titlePasien; - } - - @Column(name = "ObjectTitleFk", insertable = false, updatable = false) private Integer titlePasienId; - @ManyToOne - @JoinColumn(name = "ObjectTypePegawaiFk") @Caption(value = "Object Type Pegawai") private TypePegawaiVO typePegawai; - -// @Caption(value = "Object Atasan Langsung") -// private PegawaiVO atasanLangsung; - -// private Integer atasanLangsungId; - -// @Caption(value = "Object Pejabat Penilai") -// private PegawaiVO pejabatPenilai; - -// private Integer pejabatPenilaiId; - @Column(name = "KdTypePegawai", nullable = true) - public TypePegawaiVO getTypePegawai() { - return typePegawai; - } - - public void setTypePegawai(TypePegawaiVO typePegawai) { - this.typePegawai = typePegawai; - } - - @Column(name = "ObjectTypePegawaiFk", insertable = false, updatable = false) private Integer typePegawaiId; @Caption(value = "Nama Keluarga") private String namaKeluarga; - @Column(name = "NamaKeluarga", nullable = true, length = 30) - public String getNamaKeluarga() { - return namaKeluarga; - } - - public void setNamaKeluarga(String namaKeluarga) { - this.namaKeluarga = namaKeluarga; - } - @Caption(value = "Nama Lengkap") private String namaLengkap; - @Column(name = "NamaLengkap", nullable = true, length = 40) - public String getNamaLengkap() { - return namaLengkap; - } - - public void setNamaLengkap(String namaLengkap) { - this.namaLengkap = namaLengkap; - } - @Caption(value = "Nama Panggilan") private String namaPanggilan; - @Column(name = "NamaPanggilan", nullable = true, length = 20) - public String getNamaPanggilan() { - return namaPanggilan; - } - - public void setNamaPanggilan(String namaPanggilan) { - this.namaPanggilan = namaPanggilan; - } - @Caption(value = "NI K_ Intern") private String nikIntern; - @Column(name = "NIK_Intern", nullable = true, length = 15) - public String getNikIntern() { - return nikIntern; - } - - public void setNikIntern(String nikIntern) { - this.nikIntern = nikIntern; - } - @Caption(value = "NI P_ P N S") private String nipPns; - @Column(name = "NIP_PNS", nullable = true, length = 30) - public String getNipPns() { - return nipPns; - } - - public void setNipPns(String nipPns) { - this.nipPns = nipPns; - } - @Caption(value = "No Identitas") private String noIdentitas; - /* - * @ManyToOne - * - * @JoinColumn(name = "NoSK_HasilFk") - * - * @Caption(value="No S K_ Hasil") private SuratKeputusan nosk_hasil; - * - * public void setNoSK_Hasil(SuratKeputusan nosk_hasil) { this.nosk_hasil = - * nosk_hasil; } - * - * @Column(name = "NoSK_Hasil", nullable = true , length = 10) public - * SuratKeputusan getNoSK_Hasil(){ return this.nosk_hasil; } - * - * @Column(name = "NoSK_HasilFk", insertable=false,updatable=false) private - * Integer NoSK_HasilId; - * - * @ManyToOne - * - * @JoinColumn(name = "NoStruk_TTujuanLastFk") - * - * @Caption(value="No Struk_ T Tujuan Last") private StrukPelayanan - * nostruk_ttujuanlast; - * - * public void setNoStruk_TTujuanLast(StrukPelayanan nostruk_ttujuanlast) { - * this.nostruk_ttujuanlast = nostruk_ttujuanlast; } - * - * @Column(name = "NoStruk_TTujuanLast", nullable = true , length = 10) - * public StrukPelayanan getNoStruk_TTujuanLast(){ return - * this.nostruk_ttujuanlast; } - */ - - @Column(name = "NoIdentitas", nullable = true, length = 30) - public String getNoIdentitas() { - return noIdentitas; - } - - public void setNoIdentitas(String noIdentitas) { - this.noIdentitas = noIdentitas; - } - - @Column(name = "NoStruk_TTujuanLastFk", insertable = false, updatable = false) private Integer noStruk_TTujuanLastId; @Caption(value = "NP W P") private String npwp; - @Column(name = "NPWP", nullable = true, length = 30) - public String getNpwp() { - return npwp; - } - - public void setNpwp(String npwp) { - this.npwp = npwp; - } - @Caption(value = "Photo Diri") private String photoDiri; - @Column(name = "PhotoDiri", nullable = true, length = 2147483647) - public String getPhotoDiri() { - return photoDiri; - } - - public void setPhotoDiri(String photoDiri) { - this.photoDiri = photoDiri; - } - @Caption(value = "QPegawai") private short qPegawai; - @Column(name = "QPegawai", nullable = true) - public short getqPegawai() { - return qPegawai; - } - - public void setqPegawai(short qPegawai) { - this.qPegawai = qPegawai; - } - @Caption(value = "Qty Anak") private Byte qtyAnak; - @Column(name = "QtyAnak", nullable = true) - public Byte getQtyAnak() { - return qtyAnak; - } - - public void setQtyAnak(Byte qtyAnak) { - this.qtyAnak = qtyAnak; - } - @Caption(value = "Qty Tanggungan") private Byte qtyTanggungan; - @Column(name = "QtyTanggungan", nullable = true) - public Byte getQtyTanggungan() { - return qtyTanggungan; - } - - public void setQtyTanggungan(Byte qtyTanggungan) { - this.qtyTanggungan = qtyTanggungan; - } - @Caption(value = "Qty Total Jiwa") private Byte qtyTotalJiwa; - @Column(name = "QtyTotalJiwa", nullable = true) - public Byte getQtyTotalJiwa() { - return qtyTotalJiwa; - } - - public void setQtyTotalJiwa(Byte qtyTotalJiwa) { - this.qtyTotalJiwa = qtyTotalJiwa; - } - @Caption(value = "Status Rhesus") private String statusRhesus; - @Column(name = "StatusRhesus", nullable = true, length = 1) - public String getStatusRhesus() { - return statusRhesus; - } - - public void setStatusRhesus(String statusRhesus) { - this.statusRhesus = statusRhesus; - } - @Caption(value = "Tempat Lahir") private String tempatLahir; - @Column(name = "TempatLahir", nullable = true, length = 30) - public String getTempatLahir() { - return tempatLahir; - } - - public void setTempatLahir(String tempatLahir) { - this.tempatLahir = tempatLahir; - } - @Caption(value = "Tanggal Daftar Finger Print") private Date tglDaftarFingerPrint; - @Column(name = "TglDaftarFingerPrint", nullable = true) - public Date getTglDaftarFingerPrint() { - return tglDaftarFingerPrint; - } - - public void setTglDaftarFingerPrint(Date tglDaftarFingerPrint) { - this.tglDaftarFingerPrint = tglDaftarFingerPrint; - } - @Caption(value = "Tanggal Keluar") private Date tglKeluar; - @Column(name = "TglKeluar", nullable = true) - public Date getTglKeluar() { - return tglKeluar; - } - - public void setTglKeluar(Date tglKeluar) { - this.tglKeluar = tglKeluar; - } - @Caption(value = "Tanggal Lahir") private Date tglLahir; - @Column(name = "TglLahir", nullable = true) - public Date getTglLahir() { - return tglLahir; - } - - public void setTglLahir(Date tglLahir) { - this.tglLahir = tglLahir; - } - @Caption(value = "Tanggal Masuk") private Date tglMasuk; - @Column(name = "TglMasuk", nullable = true) - public Date getTglMasuk() { - return tglMasuk; - } - - public void setTglMasuk(Date tglMasuk) { - this.tglMasuk = tglMasuk; - } - @Caption(value = "Total Nilai Score") private Double totalNilaiScore; - public Double getTotalNilaiScore() { - return totalNilaiScore; - } - - public void setTotalNilaiScore(Double totalNilaiScore) { - this.totalNilaiScore = totalNilaiScore; - } - - @ManyToOne - @JoinColumn(name = "ObjectPegawaiFk") - @Caption(value = "Object Pegawai") - // @JsonBackReference private PegawaiVO pegawai; - public PegawaiVO getPegawai() { - return pegawai; - } - - public void setPegawai(PegawaiVO pegawai) { - this.pegawai = pegawai; - } - - @ManyToOne - @JoinColumn(name = "ObjectPegawaiPembimbingFk") @Caption(value = "Object Pegawai Pembimbing") private PegawaiVO pegawaiPembimbing; - public PegawaiVO getPegawaiPembimbing() { - return pegawaiPembimbing; - } - - public void setPegawaiPembimbing(PegawaiVO pegawaiPembimbing) { - this.pegawaiPembimbing = pegawaiPembimbing; - } - - @ManyToOne - @JoinColumn(name = "ObjectPegawaiAtasanFk") @Caption(value = "Object Pegawai Atasan") private PegawaiVO pegawaiAtasan; - public PegawaiVO getPegawaiAtasan() { - return pegawaiAtasan; - } - - public void setPegawaiAtasan(PegawaiVO pegawaiAtasan) { - this.pegawaiAtasan = pegawaiAtasan; - } - @Caption(value = "Email") - @Column(name = "Email", nullable = true, length = 100) private String email; @Caption(value = "Email Alternatif") - @Column(name = "EmailAlternatif", nullable = true, length = 100) private String emailAlternatif; @Caption(value = "No Tlp") - @Column(name = "NoTlp", nullable = true, length = 50) private String noTlp; @Caption(value = "No Handphone") - @Column(name = "NoHandphone", nullable = true, length = 50) private String noHandphone; - 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; - } - - // -----------------------------add by Pratama --------------------------// - @Column(name = "NoBPJS", nullable = true) private String noBPJS; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "ObjectSatuanKerjaFK") private SatuanKerjaVO satuanKerjaVO; - @Column(name = "ObjectSatuanKerjaFK", insertable = false, updatable = false, nullable = true) private Integer satuanKerjaId; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pegawai") @Caption(value = "jadwal Pemeriksaan") - private Set jadwalPemeriksaanSet = new HashSet(); + private Set jadwalPemeriksaanSet = new HashSet<>(); - public String getNoBPJS() { - return noBPJS; - } - - public void setNoBPJS(String noBPJS) { - this.noBPJS = noBPJS; - } - - public SatuanKerjaVO getSatuanKerjaVO() { - return satuanKerjaVO; - } - - public void setSatuanKerjaVO(SatuanKerjaVO satuanKerjaVO) { - this.satuanKerjaVO = satuanKerjaVO; - } - - public Set getJadwalPemeriksaanSet() { - return jadwalPemeriksaanSet; - } - - public void setJadwalPemeriksaanSet(Set jadwalPemeriksaanSet) { - this.jadwalPemeriksaanSet = jadwalPemeriksaanSet; - } - - // -------------------------end add by Pratama ---------------------------// - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "objectjabatanInternalfk") private JabatanVO jabatanInternal; - @Column(name = "objectjabatanInternalfk", insertable = false, updatable = false,nullable = true) private Integer jabatanInternalId; - - @Column(name = "isMenanggung", nullable = true) + private Boolean isMenanggung; - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pegawai") + private Set riwayatPendidikanSet = new HashSet<>(); - - - public Set getRiwayatPendidikanSet() { - return riwayatPendidikanSet; - } - - public void setRiwayatPendidikanSet(Set riwayatPendidikanSet) { - this.riwayatPendidikanSet = riwayatPendidikanSet; - } - - public Date getTglPensiun() { - return tglPensiun; - } - - public void setTglPensiun(Date tglPensiun) { - this.tglPensiun = tglPensiun; - } - - public Boolean getIsMenanggung() { - return isMenanggung; - } - - public void setIsMenanggung(Boolean isMenanggung) { - this.isMenanggung = isMenanggung; - } - -// 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 Set getMapPegawaiJabatanToUnitKerja() { -// return mapPegawaiJabatanToUnitKerja; -// } - -// public void setMapPegawaiJabatanToUnitKerja(Set mapPegawaiJabatanToUnitKerja) { -// this.mapPegawaiJabatanToUnitKerja = mapPegawaiJabatanToUnitKerja; -// } - } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO_.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO_.java deleted file mode 100644 index 551de47a..00000000 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiVO_.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.jasamedika.medifirst2000.vo; - -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai; -import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; -import com.jasamedika.medifirst2000.helper.Caption; - -/** - * class Pegawai - * - * @author salmanoe - */ -public class PegawaiVO_ extends BaseMasterVO { -// private Pegawai pegawai; - private Jabatan jabatanInternal; - private SubUnitKerjaPegawai unitKerja; - private UnitKerjaPegawai unitKerjaPegawai; - private Boolean isCanCreateJadwal; - private Boolean isPrimary; - private Boolean statusEnabled1; -// public Pegawai getPegawai() { -// return pegawai; -// } -// public void setPegawai(Pegawai pegawai) { -// this.pegawai = pegawai; -// } - public Jabatan getJabatanInternal() { - return jabatanInternal; - } - public void setJabatanInternal(Jabatan jabatanInternal) { - this.jabatanInternal = jabatanInternal; - } - public SubUnitKerjaPegawai getUnitKerja() { - return unitKerja; - } - public void setUnitKerja(SubUnitKerjaPegawai unitKerja) { - this.unitKerja = unitKerja; - } - public UnitKerjaPegawai getUnitKerjaPegawai() { - return unitKerjaPegawai; - } - public void setUnitKerjaPegawai(UnitKerjaPegawai unitKerjaPegawai) { - this.unitKerjaPegawai = unitKerjaPegawai; - } - public Boolean getIsCanCreateJadwal() { - return isCanCreateJadwal; - } - public void setIsCanCreateJadwal(Boolean isCanCreateJadwal) { - this.isCanCreateJadwal = isCanCreateJadwal; - } - public Boolean getIsPrimary() { - return isPrimary; - } - public void setIsPrimary(Boolean isPrimary) { - this.isPrimary = isPrimary; - } - public Boolean getStatusEnabled1() { - return statusEnabled1; - } - public void setStatusEnabled1(Boolean statusEnabled1) { - this.statusEnabled1 = statusEnabled1; - } - -} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RuanganVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RuanganVO.java index b6304a8a..7e202ee7 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RuanganVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RuanganVO.java @@ -6,9 +6,12 @@ import java.util.Set; import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class RuanganVO extends BaseMasterVO { - @Caption(value = "AlamatVO Email") private String alamatEmail; @@ -78,236 +81,11 @@ public class RuanganVO extends BaseMasterVO { private RuanganVO headRuangan; private Integer headRuanganId; - + Set kamarSet = new HashSet<>(); - + @Caption(value = "Object Unit Kerja") private UnitKerjaPegawaiVO unitKerja; - + private Integer unitKerjaId; - - public String getAlamatEmail() { - return alamatEmail; - } - - public void setAlamatEmail(String alamatEmail) { - this.alamatEmail = alamatEmail; - } - - public String getFaksimile() { - return faksimile; - } - - public void setFaksimile(String faksimile) { - this.faksimile = faksimile; - } - - public String getFixedPhone() { - return fixedPhone; - } - - public void setFixedPhone(String fixedPhone) { - this.fixedPhone = fixedPhone; - } - - public String getJamBuka() { - return jamBuka; - } - - public void setJamBuka(String jamBuka) { - this.jamBuka = jamBuka; - } - - public String getJamTutup() { - return jamTutup; - } - - public void setJamTutup(String jamTutup) { - this.jamTutup = jamTutup; - } - - public DepartemenVO getDepartemen() { - return departemen; - } - - public void setDepartemen(DepartemenVO departemen) { - this.departemen = departemen; - } - - public Integer getDepartemenId() { - return departemenId; - } - - public void setDepartemenId(Integer departemenId) { - this.departemenId = departemenId; - } - - public KelasVO getKelasHead() { - return kelasHead; - } - - public void setKelasHead(KelasVO kelasHead) { - this.kelasHead = kelasHead; - } - - public Integer getKelasHeadId() { - return kelasHeadId; - } - - public void setKelasHeadId(Integer kelasHeadId) { - this.kelasHeadId = kelasHeadId; - } - - public ModulAplikasiVO getModulAplikasi() { - return modulAplikasi; - } - - public void setModulAplikasi(ModulAplikasiVO modulAplikasi) { - this.modulAplikasi = modulAplikasi; - } - - public Integer getModulAplikasiId() { - return modulAplikasiId; - } - - public void setModulAplikasiId(Integer modulAplikasiId) { - this.modulAplikasiId = modulAplikasiId; - } - - public LoginUserVO getPegawaiKepala() { - return pegawaiKepala; - } - - public void setPegawaiKepala(LoginUserVO pegawaiKepala) { - this.pegawaiKepala = pegawaiKepala; - } - - public Integer getPegawaiKepalaId() { - return pegawaiKepalaId; - } - - public void setPegawaiKepalaId(Integer pegawaiKepalaId) { - this.pegawaiKepalaId = pegawaiKepalaId; - } - - public String getKdRuangan() { - return kdRuangan; - } - - public void setKdRuangan(String kdRuangan) { - this.kdRuangan = kdRuangan; - } - - public String getLokasiRuangan() { - return lokasiRuangan; - } - - public void setLokasiRuangan(String lokasiRuangan) { - this.lokasiRuangan = lokasiRuangan; - } - - public String getMobilePhone() { - return mobilePhone; - } - - public void setMobilePhone(String mobilePhone) { - this.mobilePhone = mobilePhone; - } - - public String getNamaRuangan() { - return namaRuangan; - } - - public void setNamaRuangan(String namaRuangan) { - this.namaRuangan = namaRuangan; - } - - public Integer getNoCounter() { - return noCounter; - } - - public void setNoCounter(Integer noCounter) { - this.noCounter = noCounter; - } - - public String getNoRuangan() { - return noRuangan; - } - - public void setNoRuangan(String noRuangan) { - this.noRuangan = noRuangan; - } - - public String getPrefixNoAntrian() { - return prefixNoAntrian; - } - - public void setPrefixNoAntrian(String prefixNoAntrian) { - this.prefixNoAntrian = prefixNoAntrian; - } - - public short getqRuangan() { - return qRuangan; - } - - public void setqRuangan(short qRuangan) { - this.qRuangan = qRuangan; - } - - public Boolean getStatusViewData() { - return statusViewData; - } - - public void setStatusViewData(Boolean statusViewData) { - this.statusViewData = statusViewData; - } - - public String getWebsite() { - return website; - } - - public void setWebsite(String website) { - this.website = website; - } - - public RuanganVO getHeadRuangan() { - return headRuangan; - } - - public void setHeadRuangan(RuanganVO headRuangan) { - this.headRuangan = headRuangan; - } - - public Integer getHeadRuanganId() { - return headRuanganId; - } - - public void setHeadRuanganId(Integer headRuanganId) { - this.headRuanganId = headRuanganId; - } - - public Set getKamarSet() { - return kamarSet; - } - - public void setKamarSet(Set kamarSet) { - this.kamarSet = kamarSet; - } - - public UnitKerjaPegawaiVO getUnitKerja() { - return unitKerja; - } - - public void setUnitKerja(UnitKerjaPegawaiVO unitKerja) { - this.unitKerja = unitKerja; - } - - public Integer getUnitKerjaId() { - return unitKerjaId; - } - - public void setUnitKerjaId(Integer unitKerjaId) { - this.unitKerjaId = unitKerjaId; - } - } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java index db41b935..64a0aa0e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java @@ -14,11 +14,9 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import org.json.JSONException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataIntegrityViolationException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -34,7 +32,6 @@ import org.springframework.web.servlet.ModelAndView; import com.jasamedika.medifirst2000.constants.Constants; import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; import com.jasamedika.medifirst2000.controller.base.LocaleController; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.KelompokPasienConverter; @@ -44,10 +41,10 @@ import com.jasamedika.medifirst2000.dao.MappingPasienPacsDao; import com.jasamedika.medifirst2000.dao.PasienDaftarDao; import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum; -import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto; import com.jasamedika.medifirst2000.dto.Antrian; import com.jasamedika.medifirst2000.dto.AntrianPasienDiperiksaDto; +import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum; +import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto; import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto; import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; import com.jasamedika.medifirst2000.entities.Alamat; @@ -84,7 +81,6 @@ import com.jasamedika.medifirst2000.service.PapPengambilanSpesimenService; import com.jasamedika.medifirst2000.service.PasienDaftarService; import com.jasamedika.medifirst2000.service.PasienService; import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.service.PelayananLaboratoriumService; import com.jasamedika.medifirst2000.service.PelayananObatService; import com.jasamedika.medifirst2000.service.PelayananPasienService; import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; @@ -103,26 +99,21 @@ import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.JsonUtil; import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO; import com.jasamedika.medifirst2000.vo.AlamatVO; import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; import com.jasamedika.medifirst2000.vo.AsalRujukanVO; -import com.jasamedika.medifirst2000.vo.AsuransiPasienVO; import com.jasamedika.medifirst2000.vo.AsuransiRegistrasiPasienVO; import com.jasamedika.medifirst2000.vo.DiagnosaVO; import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO; import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO; import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO; import com.jasamedika.medifirst2000.vo.HeaderDetailHasilDeviceVO; -import com.jasamedika.medifirst2000.vo.IpsrsSertifikatKalibrasiVO; import com.jasamedika.medifirst2000.vo.JenisKelaminVO; -import com.jasamedika.medifirst2000.vo.K3CheckListFacillitySefetyVO; import com.jasamedika.medifirst2000.vo.KelompokPasienVO; import com.jasamedika.medifirst2000.vo.KendaliDokumenRekamMedisVO; import com.jasamedika.medifirst2000.vo.KirimProdukVO; import com.jasamedika.medifirst2000.vo.MainPelayananDetailVO; import com.jasamedika.medifirst2000.vo.OrderPelayananCustomVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananVO; import com.jasamedika.medifirst2000.vo.OrderProdukGiziVO; import com.jasamedika.medifirst2000.vo.OrderProdukVO; import com.jasamedika.medifirst2000.vo.PapInformasiIbuVO; @@ -136,7 +127,6 @@ import com.jasamedika.medifirst2000.vo.PelayananPasienVO; import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; import com.jasamedika.medifirst2000.vo.PendidikanVO; import com.jasamedika.medifirst2000.vo.PersetujuanUmumVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; import com.jasamedika.medifirst2000.vo.RencanaOperasiCustomVO; import com.jasamedika.medifirst2000.vo.RencanaOperasiVO; @@ -144,7 +134,6 @@ import com.jasamedika.medifirst2000.vo.ResumeMedisVO; import com.jasamedika.medifirst2000.vo.RuanganVO; import com.jasamedika.medifirst2000.vo.SiklusGiziVO; import com.jasamedika.medifirst2000.vo.StatusKemandirianVO; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; import com.jasamedika.medifirst2000.vo.StrukOrderVO; import com.jasamedika.medifirst2000.vo.StrukPelayananVO; import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO; @@ -160,16 +149,16 @@ public class RegistrasiPelayananController extends LocaleController { @Autowired private ResumeMedisService resumeMedisService; - + @Autowired private KendaliDokumenRekamMedisService kendaliDokumenRekamMedisService; - + @Autowired private RencanaOperasiService rencanaOperasiService; - + @Autowired private StrukOrderService strukOrderService; - + @Autowired private BridgingBpjs bridgingBpjs; @@ -199,7 +188,7 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @RequestMapping(value = "/save-permintaan-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRencanaOperasiNew(@Valid @RequestBody RencanaOperasiCustomVO vo, HttpServletRequest request) throws ParseException { @@ -310,12 +299,14 @@ public class RegistrasiPelayananController extends LocaleController { private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); @RequestMapping(value = "/save-pap-informasi-ibu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo,HttpServletRequest request) { + public ResponseEntity> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo, + HttpServletRequest request) { try { - Map result = papInformasiIbuService.savePapInformasiIbu(vo); + Map result = papInformasiIbuService.savePapInformasiIbu(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when savePapInformasiIbu", e.getMessage()); @@ -328,7 +319,6 @@ public class RegistrasiPelayananController extends LocaleController { } } - @RequestMapping(value = "/save-kirim-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveKirimProduk(@Valid @RequestBody List vo, @@ -362,7 +352,7 @@ public class RegistrasiPelayananController extends LocaleController { if (vo.getTanggalPendaftaran().indexOf("-") > -1) vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); else - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); + vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); Map result = orderProdukService.saveOrderProduk(vo); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -400,7 +390,6 @@ public class RegistrasiPelayananController extends LocaleController { } - @Autowired private StrukOrderDao strukOrderDao; @@ -631,13 +620,15 @@ public class RegistrasiPelayananController extends LocaleController { // @RequestMapping(value = "/save-verifikasi-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveVerifikasiPelayananObat(@Valid @RequestBody MainPelayananDetailVO vo, HttpServletRequest request) { + public ResponseEntity> saveVerifikasiPelayananObat(@Valid @RequestBody MainPelayananDetailVO vo, + HttpServletRequest request) { try { - Map result = pelayananObatService.saveVerifikasiPelayananObat3(vo); - if (CommonUtil.isNotNullOrEmpty(result)){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } else{ + Map result = pelayananObatService.saveVerifikasiPelayananObat3(vo); + if (CommonUtil.isNotNullOrEmpty(result)) { + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", "Tidak ada stok"); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); @@ -675,7 +666,7 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @RequestMapping(value = "/update-status-order/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> updateStatusOrder(@RequestParam(value = "noOrder") String noOrder, @RequestParam(value = "status") Byte status, HttpServletRequest request) throws ParseException { @@ -699,9 +690,10 @@ public class RegistrasiPelayananController extends LocaleController { } @RequestMapping(value = "/save-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) throws ParseException { + public ResponseEntity> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) + throws ParseException { try { - if(CommonUtil.isNotNullOrEmpty(vo.getTanggalPendaftaran())) { + if (CommonUtil.isNotNullOrEmpty(vo.getTanggalPendaftaran())) { vo.setTglRegistrasi(DateUtil.toDate(vo.getTanggalPendaftaran())); } Map result = pelayananObatService.savePelayananObat3(vo); @@ -900,17 +892,19 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); } - + @Autowired private PelayananPasienService pelayananPasienService; - + @RequestMapping(value = "/delete-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> deleteOrderPelayanan(@Valid @RequestBody List> vo,HttpServletRequest request) { - try { - Map result = pelayananPasienService.deletePelayanan(vo); + public ResponseEntity> deleteOrderPelayanan(@Valid @RequestBody List> vo, + HttpServletRequest request) { + try { + Map result = pelayananPasienService.deletePelayanan(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when deleteOrderPelayanan", e.getMessage()); @@ -974,11 +968,10 @@ public class RegistrasiPelayananController extends LocaleController { } @RequestMapping(value = "/save-touch-screen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRegistrasiPasienOnline( - @Valid @RequestBody Antrian antrian, + public ResponseEntity> saveRegistrasiPasienOnline(@Valid @RequestBody Antrian antrian, HttpServletRequest request) { try { - + AntrianPasienRegistrasiVO vo = new AntrianPasienRegistrasiVO(); vo.setTipePasien(TipePasienEnum.BARU.getVal()); PasienVO pasien = new PasienVO(); @@ -1144,9 +1137,9 @@ public class RegistrasiPelayananController extends LocaleController { try { Map result = registrasiPelayananService.savePasienDafar(vo); if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try{ + try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - }catch(Exception ex){ + } catch (Exception ex) { ex.getMessage(); } mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -1281,7 +1274,7 @@ public class RegistrasiPelayananController extends LocaleController { noRec, noMr); if (mappingPasienPacs == null) mappingPasienPacs = new MappingPasienPacs(); - mappingPasienPacs.setStudyInstanceUID(id); + mappingPasienPacs.setStudyInstanceUID(id); mappingPasienPacs.setNoMr(noMr); AntrianPasienDiPeriksa pasienDaftar = new AntrianPasienDiPeriksa(); pasienDaftar.setNoRec(noRec); @@ -1435,7 +1428,7 @@ public class RegistrasiPelayananController extends LocaleController { ruanganVo.setKamarSet(null); ruanganVo.setId(vo.getId()); ruanganVo.setKdProfile(vo.getKdProfile()); - ruanganVo.setqRuangan(vo.getqRuangan()); + ruanganVo.setQRuangan(vo.getQRuangan()); ruanganVo.setKdRuangan(vo.getKdRuangan()); ruanganVo.setNamaRuangan(vo.getNamaRuangan()); ruanganVo.setDepartemenId(vo.getDepartemenId()); @@ -1632,7 +1625,7 @@ public class RegistrasiPelayananController extends LocaleController { } @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list/",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/antrian-pasien-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @@ -1765,8 +1758,8 @@ public class RegistrasiPelayananController extends LocaleController { public ResponseEntity getNoRegistrasi(@Valid @RequestBody PemakaianAsuransiVO vo, HttpServletRequest request) throws ParseException { try { - return RestUtil.getJsonResponse(pasienDaftarDao - .finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi()) + return RestUtil.getJsonResponse(pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), + vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi()) .getNoRegistrasi(), HttpStatus.ACCEPTED); } catch (ServiceVOException e) { @@ -1812,20 +1805,24 @@ public class RegistrasiPelayananController extends LocaleController { @SuppressWarnings("unchecked") @RequestMapping(value = "/get-registrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getRegistrasi(@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { + public ResponseEntity> getRegistrasi( + @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map result = registrasiPelayananService.findPasienDaftarById(noRegistrasi); return RestUtil.getJsonResponse(result); } + @SuppressWarnings("unchecked") @RequestMapping(value = "/update-status-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> upateStatusAntrian( @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, @RequestParam(value = "statusAntrian", required = true) String statusAntrian, @RequestParam(value = "tglDipanggilSuster", required = true) String tglDipanggilSuster, - @RequestParam(value = "tglDipanggilDokter", required = true) String tglDipanggilDokter, HttpServletRequest request) { + @RequestParam(value = "tglDipanggilDokter", required = true) String tglDipanggilDokter, + HttpServletRequest request) { try { - Map result = registrasiPelayananService.updatStatusAntrian(noRegistrasi, statusAntrian,tglDipanggilSuster,tglDipanggilDokter); + Map result = registrasiPelayananService.updatStatusAntrian(noRegistrasi, statusAntrian, + tglDipanggilSuster, tglDipanggilDokter); Boolean dataFound = new Boolean((boolean) result.get("dataFound")); BroadcastMessage("DashboardLaboratorium", "noRec"); BroadcastMessage("DaftarAntrian", "noRec"); @@ -1833,7 +1830,7 @@ public class RegistrasiPelayananController extends LocaleController { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); @@ -1984,7 +1981,7 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "noRec", required = true) String noRec) { List list = registrasiPelayananPasienService.findAntrian(noRec); - + m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Slip Antrian"); @@ -2001,7 +1998,7 @@ public class RegistrasiPelayananController extends LocaleController { public ModelAndView generateAntrianPasienReservasi(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "noRec", required = true) String noRec) { - + List list = registrasiPelayananPasienService.findAntrian(noRec); m.addObject("dataSource", list); @@ -2290,7 +2287,7 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId, @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingRawatInap(page, limit, sort, - dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId,noRegistrasi); + dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, noRegistrasi); return constructListPageResult(resultPageMap); } @@ -2445,12 +2442,12 @@ public class RegistrasiPelayananController extends LocaleController { @RequestMapping(value = "/save-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo, HttpServletRequest request) { - try { - Map result= registrasiPelayananService.saveAsuransiPasien(vo); + try { + Map result = registrasiPelayananService.saveAsuransiPasien(vo); if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try{ + try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - }catch(Exception ex){ + } catch (Exception ex) { ex.getMessage(); } mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -2464,16 +2461,26 @@ public class RegistrasiPelayananController extends LocaleController { } catch (ServiceVOException e) { LOGGER.error("Got exception {} when save Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());//delete sep that has been created + bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete + // sep + // that + // has + // been + // created return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());//delete sep that has been created + bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete + // sep + // that + // has + // been + // created return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/save-pelayanan-obat-luar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> savePelayananObatLuar(@Valid @RequestBody PelayananObatLuarVO vo, HttpServletRequest request) { @@ -2494,10 +2501,10 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @Autowired private DaftarStrukPenjualanService service; - + @RequestMapping(value = "/save-retur-penjualan-bebas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveReturPenjualanBebas(@Valid @RequestBody StrukPelayananVO vo, HttpServletRequest request) { @@ -2565,9 +2572,11 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/get-produk-penjualan-bebas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getProdukPenjualanBebas(@RequestParam(value = "noRecStrukPelayanan", required = false) String noRecStrukPelayanan, HttpServletRequest request) { + public ResponseEntity> getProdukPenjualanBebas( + @RequestParam(value = "noRecStrukPelayanan", required = false) String noRecStrukPelayanan, + HttpServletRequest request) { try { Map result = pelayananObatService.getProdukPenjualanBebas(noRecStrukPelayanan); if (null != result) { @@ -2926,8 +2935,7 @@ public class RegistrasiPelayananController extends LocaleController { @RequestMapping(value = "/get-produksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getProduksi( - @RequestParam(value = "noRecOrders", required = true) String noRecOrder, - HttpServletRequest request) + @RequestParam(value = "noRecOrders", required = true) String noRecOrder, HttpServletRequest request) throws ParseException { try { List list = new ArrayList(); @@ -3082,11 +3090,11 @@ public class RegistrasiPelayananController extends LocaleController { } @RequestMapping(value = "/save-verifikasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> saveVerifikasi(@RequestBody List dtos, HttpServletRequest request) - throws ParseException { + public ResponseEntity>> saveVerifikasi(@RequestBody List dtos, + HttpServletRequest request) throws ParseException { try { List> result = orderProdukService.saveVerifikasiGiziAll(dtos); - if (result!=null) { + if (result != null) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Produk Gizi", "Permintaan", request); @@ -3143,7 +3151,7 @@ public class RegistrasiPelayananController extends LocaleController { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); List> result = orderProdukService.cekStokGiziProduksi(vo); - if (result!=null) { + if (result != null) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Cek Produk Gizi", "Permintaan", request); @@ -3292,19 +3300,18 @@ public class RegistrasiPelayananController extends LocaleController { } } - @RequestMapping(value = "/save-order-produk-lab", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderProdukLab( - @RequestParam(value = "cito", required = false ,defaultValue = "0") int cito, @Valid @RequestBody OrderProdukVO vo, - HttpServletRequest request) throws ParseException { + @RequestParam(value = "cito", required = false, defaultValue = "0") int cito, + @Valid @RequestBody OrderProdukVO vo, HttpServletRequest request) throws ParseException { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (vo.getTanggalPendaftaran().indexOf("-") > -1) vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); else vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - Map result = orderProdukService.saveOrderProduklab(vo,cito); + Map result = orderProdukService.saveOrderProduklab(vo, cito); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3340,14 +3347,14 @@ public class RegistrasiPelayananController extends LocaleController { } } - - + @RequestMapping(value = "/delete-order-laborat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> hapusOrderLab(@RequestParam(value = "noRec", required = true) String noRec, - HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.deleteOrderlaboratorium(noRec); + public ResponseEntity> hapusOrderLab( + @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) + throws ParseException { + try { + + Map result = orderProdukService.deleteOrderlaboratorium(noRec); if (null != result) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3366,13 +3373,14 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @RequestMapping(value = "/save-tambahan-order", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderLaborat(@RequestParam(value = "cito", required = false ,defaultValue = "0") int cito, - @Valid @RequestBody Map map,HttpServletRequest request) throws ParseException { + public ResponseEntity> saveOrderLaborat( + @RequestParam(value = "cito", required = false, defaultValue = "0") int cito, + @Valid @RequestBody Map map, HttpServletRequest request) throws ParseException { try { - Map result = orderProdukService.updateOrderProduklab(map,cito); + Map result = orderProdukService.updateOrderProduklab(map, cito); if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3391,7 +3399,8 @@ public class RegistrasiPelayananController extends LocaleController { } @RequestMapping(value = "/get-produk-produksi-gizi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getProdukProduksiGizi(@RequestParam(value="menu",required=false) String menu,HttpServletRequest request) + public ResponseEntity>> getProdukProduksiGizi( + @RequestParam(value = "menu", required = false) String menu, HttpServletRequest request) throws ParseException { try { List> result = orderProdukService.getAllProdukProduksiGizi(menu); @@ -3412,10 +3421,10 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/jenis-produk/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getJenisProdukRadiologi( HttpServletRequest request) { + public ResponseEntity>> getJenisProdukRadiologi(HttpServletRequest request) { try { List> result = registrasiPelayananService.findJenisProdukRadiologi(); @@ -3434,7 +3443,7 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/antrian-pasien-list-radiologi-new/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAllRadiologiVONewWithQueryString( @@ -3454,12 +3463,13 @@ public class RegistrasiPelayananController extends LocaleController { if (noCm.equals("-")) { noCm = null; } - Map resultPageMap = registrasiPelayananService.findAllAntrianPagingByPemeriksaan(page, limit, sort, dir, - ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir,jenisProduk); + Map resultPageMap = registrasiPelayananService.findAllAntrianPagingByPemeriksaan(page, limit, + sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir, + jenisProduk); return constructListPageResult(resultPageMap); } - + @RequestMapping(value = "/save-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiVO vo, HttpServletRequest request) throws ParseException { @@ -3483,15 +3493,15 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-rencana-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getRencanaOperasi( @PathVariable("noRec") String noRec, - HttpServletRequest request) { - + public ResponseEntity> getRencanaOperasi(@PathVariable("noRec") String noRec, + HttpServletRequest request) { + Map result = null; try { - + result = rencanaOperasiService.getRencanaOperasiByNorec(noRec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3501,7 +3511,7 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @RequestMapping(value = "/save-batal-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveBatalOperasi(@Valid @RequestBody RencanaOperasiVO vo, HttpServletRequest request) throws ParseException { @@ -3525,15 +3535,14 @@ public class RegistrasiPelayananController extends LocaleController { } } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-all-permintaan-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllPermintaanOperasi( - HttpServletRequest request) { - + public ResponseEntity>> getAllPermintaanOperasi(HttpServletRequest request) { + List> result = null; try { - + result = rencanaOperasiService.getPermintaanOperasi(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3543,15 +3552,14 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-all-rencana-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAllRencanaOperasi( - HttpServletRequest request) { - + public ResponseEntity>> getAllRencanaOperasi(HttpServletRequest request) { + List> result = null; try { - + result = rencanaOperasiService.getRencanaOperasi(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3560,15 +3568,16 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-permintaan-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getPermintaanOperasiByNoCmAndDate( @PathVariable("startDate") String startDate,@PathVariable("endDate") String endDate,@PathVariable("noCm") String noCm, - HttpServletRequest request) { - + public ResponseEntity>> getPermintaanOperasiByNoCmAndDate( + @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, + @PathVariable("noCm") String noCm, HttpServletRequest request) { + List> result = null; try { - + result = rencanaOperasiService.getPermintaanOperasi(startDate, endDate, noCm); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3578,15 +3587,16 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-rencana-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getRencanaOperasiByNoCmAndDate(@PathVariable("startDate") String startDate,@PathVariable("endDate") String endDate,@PathVariable("noCm") String noCm, - HttpServletRequest request) { - + public ResponseEntity>> getRencanaOperasiByNoCmAndDate( + @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, + @PathVariable("noCm") String noCm, HttpServletRequest request) { + List> result = null; try { - + result = rencanaOperasiService.getRencanaOperasi(startDate, endDate, noCm); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3596,15 +3606,15 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-permintaan-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPermintaanOperasi( @PathVariable("noRec") String noRec, - HttpServletRequest request) { - + public ResponseEntity> getPermintaanOperasi(@PathVariable("noRec") String noRec, + HttpServletRequest request) { + Map result = null; try { - + result = rencanaOperasiService.getPermintaanOperasiByNorec(noRec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3614,7 +3624,7 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @RequestMapping(value = "/update-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody List vo, HttpServletRequest request) throws ParseException { @@ -3637,7 +3647,7 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/update-dokter-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> updateDokterPelayanan(@Valid @RequestBody Map vo, HttpServletRequest request) throws ParseException { @@ -3646,7 +3656,7 @@ public class RegistrasiPelayananController extends LocaleController { if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -3657,24 +3667,22 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @Autowired private JadwalDpjpRawatInapService jadwalDpjpRawatInapService; - + @RequestMapping(value = "/get-dokter-jadwal-dpjp") @ResponseBody - public List> getLoadDataDpjp( - @RequestParam(value = "id", required = false) Integer id) { + public List> getLoadDataDpjp(@RequestParam(value = "id", required = false) Integer id) { return jadwalDpjpRawatInapService.getJadwalDpjpDokterPelayanan(id); } - + @RequestMapping(value = "/delete-dokter-jadwal-dpjp") @ResponseBody - public Map deleteDokterDpjp( - @RequestParam(value = "noRec", required = false) String noRec) { + public Map deleteDokterDpjp(@RequestParam(value = "noRec", required = false) String noRec) { return jadwalDpjpRawatInapService.deleteDokterDpjp(noRec); } - + @RequestMapping(value = "/save-resume-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> addResumeMedis(@Valid @RequestBody ResumeMedisVO vo, HttpServletRequest request) throws ParseException { @@ -3683,7 +3691,7 @@ public class RegistrasiPelayananController extends LocaleController { if (null != result) mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); @@ -3694,15 +3702,15 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-resume-medis/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getResumeMedis( @PathVariable("noRec") String noRec, - HttpServletRequest request) { - + public ResponseEntity> getResumeMedis(@PathVariable("noRec") String noRec, + HttpServletRequest request) { + Map result = null; try { - + result = resumeMedisService.getResumeMedis(noRec); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3712,15 +3720,14 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @SuppressWarnings("unchecked") @RequestMapping(value = "/get-all-ruangan-igd", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getResumeMedis( - HttpServletRequest request) { - + public ResponseEntity>> getResumeMedis(HttpServletRequest request) { + List> result = null; try { - + result = registrasiPelayananService.getRuanganIGD(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3730,7 +3737,7 @@ public class RegistrasiPelayananController extends LocaleController { } return RestUtil.getJsonResponse(result, HttpStatus.OK); } - + @RequestMapping(value = "/get-data-pasien-daftar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataPasienDaftar( @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { @@ -3753,16 +3760,16 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/edit-registrasi-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> editPasien(@Valid @RequestBody RegistrasiPelayananVO vo, HttpServletRequest request) { try { Map result = registrasiPelayananService.editPasienDaftar(vo); if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try{ + try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - }catch(Exception ex){ + } catch (Exception ex) { ex.getMessage(); } mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3783,16 +3790,16 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/edit-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> editAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo, HttpServletRequest request) { - try { - Map result= registrasiPelayananService.editAsuransiPasien(vo); + try { + Map result = registrasiPelayananService.editAsuransiPasien(vo); if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try{ + try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - }catch(Exception ex){ + } catch (Exception ex) { ex.getMessage(); } mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -3811,9 +3818,9 @@ public class RegistrasiPelayananController extends LocaleController { LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } } - - + } + } + @RequestMapping(value = "/test-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> testNoAntrian( @RequestParam(value = "idRuangan", required = false) Integer idRuangan) { @@ -3822,37 +3829,33 @@ public class RegistrasiPelayananController extends LocaleController { resultPageMap.put("noAntrian", result); return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); } - + @SuppressWarnings("deprecation") @RequestMapping(value = "/find-obat", method = RequestMethod.GET) public ResponseEntity> findObatProduk( - @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa,HttpServletRequest request){ - String data =request.getQueryString(); + @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, HttpServletRequest request) { + String data = request.getQueryString(); data = URLDecoder.decode(data); - String criteria=""; - String values=""; + String criteria = ""; + String values = ""; String[] arrQueries = data.split("&"); - for(String query : arrQueries) - { - if(query.indexOf("filter[filters][0][filter][field]")>=0) - { - if(criteria==null) - criteria=query.replace("filter[filters][0][filter][field]=", ""); + for (String query : arrQueries) { + if (query.indexOf("filter[filters][0][filter][field]") >= 0) { + if (criteria == null) + criteria = query.replace("filter[filters][0][filter][field]=", ""); else - criteria+=query.replace("filter[filters][0][filter][field]=", ""); - } - else if(query.indexOf("filter[filters][0][value]")>=0) - { - if(values==null) - values=query.replace("filter[filters][0][value]=", ""); + criteria += query.replace("filter[filters][0][filter][field]=", ""); + } else if (query.indexOf("filter[filters][0][value]") >= 0) { + if (values == null) + values = query.replace("filter[filters][0][value]=", ""); else - values+=query.replace("filter[filters][0][value]=", ""); + values += query.replace("filter[filters][0][value]=", ""); } } List resultPageMap = registrasiPelayananService.findDiagnosaByKode(kodeDiagnosa); return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); } - + @RequestMapping(value = "/get-data-mapping", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDataMapping( @RequestParam(value = "idKelas", required = false) Integer idKelas, HttpServletRequest request) { @@ -3875,13 +3878,13 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/save-kendali-dokumen-rekam-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveKendaliDokumenRekamMedis(@Valid @RequestBody KendaliDokumenRekamMedisVO vo, - HttpServletRequest request) { + public ResponseEntity> saveKendaliDokumenRekamMedis( + @Valid @RequestBody KendaliDokumenRekamMedisVO vo, HttpServletRequest request) { try { Map result = kendaliDokumenRekamMedisService.saveKendaliDokumenRekamMedis(vo); - if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { + if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); @@ -3900,15 +3903,15 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/get-antrian-kendali-dokumen-RM", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getDataMapping( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate,HttpServletRequest request) { + @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { try { - List> result = registrasiPelayananService.getListAntrian(noCm,startDate,endDate); - + List> result = registrasiPelayananService.getListAntrian(noCm, startDate, endDate); + if (null != result) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3926,17 +3929,17 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/get-daftar-kendali-dokumen-RM", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getDaftarKendaliDokumen( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "start", required = false) String start, @RequestParam(value = "end", required = false) String end, @RequestParam(value = "ruangan", required = false) String ruangan, - @RequestParam(value = "idStatus", required = false) Integer idStatus, - HttpServletRequest request) { + @RequestParam(value = "idStatus", required = false) Integer idStatus, HttpServletRequest request) { try { - Map result = registrasiPelayananService.findAllKendaliDokumenRekamMedis(noCm, start, end, ruangan, idStatus); + Map result = registrasiPelayananService.findAllKendaliDokumenRekamMedis(noCm, start, end, + ruangan, idStatus); if (null != result) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3954,16 +3957,17 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/get-riwayat-registrasi-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity>> getRiwayatRegistrasiPasien( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate,HttpServletRequest request) { + @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { try { - List> result = registrasiPelayananService.riwayatRegistrasiPasien(noCm, noRegistrasi,startDate, endDate); - + List> result = registrasiPelayananService.riwayatRegistrasiPasien(noCm, noRegistrasi, + startDate, endDate); + if (null != result) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -3981,13 +3985,13 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/get-riwayat-antrian-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getRiwayatAntrianPasien( - @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi,HttpServletRequest request) { + @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, HttpServletRequest request) { try { Map result = registrasiPelayananService.riwayatAntrianPasien(noRegistrasi); - + if (null != result) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); @@ -4005,16 +4009,16 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/update-kelas-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> updateKelasPelayanan(@Valid @RequestBody RegistrasiPelayananVO vo, HttpServletRequest request) { try { Map result = registrasiPelayananService.updateKelas(vo); if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try{ + try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - }catch(Exception ex){ + } catch (Exception ex) { ex.getMessage(); } mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, @@ -4035,13 +4039,14 @@ public class RegistrasiPelayananController extends LocaleController { return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } } - + @RequestMapping(value = "/save-akomodasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveAkomodasi(@RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar, + public ResponseEntity> saveAkomodasi( + @RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar, HttpServletRequest request) { try { Map result = registrasiPelayananService.trigerringSaveAkomodasi(noRecPasienDaftar); - if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { + if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);