salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- validasi flag anjab/nonanjab saat get data pegawai

Browse Source 
- perbaikan cuti alasan penting menjadi periode saat persetujuan cuti
This commit is contained in:
salmanoe 2021-02-03 13:19:46 +07:00
parent 764a0e8294
commit c4afad1d69
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -955,7 +955,8 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
mapFilter.put("jenisJabatan", jenisJabatan); mapFilter.put("jenisJabatan", jenisJabatan);
mapFilter.put("atasanLangsung", atasanLangsung); mapFilter.put("atasanLangsung", atasanLangsung);
mapFilter.put("pejabatPenilai", pejabatPenilai); mapFilter.put("pejabatPenilai", pejabatPenilai);
if (jabatan.get("kdJabatan").equals("ANJAB")) {
if (CommonUtil.isNotNullOrEmpty(jabatan.get("kdJabatan")) && jabatan.get("kdJabatan").equals("ANJAB")) {
mapFilter.put("kdJabatan", "ANJAB"); mapFilter.put("kdJabatan", "ANJAB");
} else { } else {
mapFilter.put("kdJabatan", "NONANJAB"); mapFilter.put("kdJabatan", "NONANJAB");

22
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
View File

@ -212,7 +212,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
@Override @Override
@Transactional(readOnly = false) @Transactional(readOnly = false)
public Map<String, Object> saveListJadwalPegawai(List<PegawaiJadwalKerjaVO> vos, boolean isUnggah, boolean isPenangguhan) { public Map<String, Object> saveListJadwalPegawai(List<PegawaiJadwalKerjaVO> vos, boolean isUnggah,
boolean isPenangguhan) {
Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> result = new HashMap<String, Object>();
for (PegawaiJadwalKerjaVO vo : vos) { for (PegawaiJadwalKerjaVO vo : vos) {
@ -230,8 +231,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
model.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan())); model.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
} }
if (isPenangguhan && CommonUtil.isNotNullOrEmpty(vo.getShift()) if (isPenangguhan && CommonUtil.isNotNullOrEmpty(vo.getShift())
&& CommonUtil.isNotNullOrEmpty(vo.getShift().getId()) && CommonUtil.isNotNullOrEmpty(vo.getShift().getId()) && vo.getShift().getId().equals(0)) {
&& vo.getShift().getId().equals(0)) {
if (CommonUtil.isNotNullOrEmpty(vo.getTanggal())) { if (CommonUtil.isNotNullOrEmpty(vo.getTanggal())) {
Date tanggal = pegawaiJadwalKerjaDao.getTanggal(vo.getTanggal().getId()); Date tanggal = pegawaiJadwalKerjaDao.getTanggal(vo.getTanggal().getId());
Map<String, Object> map = pegawaiJadwalKerjaDao.getJadwal(vo.getPegawai().getId(), Map<String, Object> map = pegawaiJadwalKerjaDao.getJadwal(vo.getPegawai().getId(),
@ -354,9 +354,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
List<String> listNorec = new ArrayList<>(); List<String> listNorec = new ArrayList<>();
List<PegawaiJadwalKerjaVO> result = new ArrayList<>(); List<PegawaiJadwalKerjaVO> result = new ArrayList<>();
DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
// Integer[] intStatusLibur = { 8, 14, 15, 40 }; Integer[] intStatusCutiBesarMelahirkan = { 2, 14, 24, 25, 6, 29, 26 };
// Integer[] intStatusSakitAlasanPenting = { 6, 42, 43, 44, 76, 77, 78, 79 };
Integer[] intStatusCutiBesarMelahirkan = { 2, 14, 24, 25, 6, 29 }; // adding_sakit_jika_2_tanggal_permohonan
Integer idTglCuti1 = null; Integer idTglCuti1 = null;
Integer idTglCuti2 = null; Integer idTglCuti2 = null;
@ -420,8 +418,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
break; break;
} }
} }
// Jika Cuti Besar atau Cuti Melahirkan atau sakit lebih dari 1 // Jika_Cuti_Besar_atau_Cuti_Melahirkan_atau_sakit_lebih_dari_1_hari
// hari
if (listNorec.size() == 2 && Arrays.asList(intStatusCutiBesarMelahirkan).contains(idStatusPegawai)) { if (listNorec.size() == 2 && Arrays.asList(intStatusCutiBesarMelahirkan).contains(idStatusPegawai)) {
PegawaiVO pegawai = new PegawaiVO(); PegawaiVO pegawai = new PegawaiVO();
ShiftKerjaVO shiftKerja = new ShiftKerjaVO(); ShiftKerjaVO shiftKerja = new ShiftKerjaVO();
@ -484,7 +481,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
String strTglCuti = df.format(tglCuti); String strTglCuti = df.format(tglCuti);
Integer idTglCuti = listTanggalCutiDao.getIdKalenderByTglCuti(strTglCuti); Integer idTglCuti = listTanggalCutiDao.getIdKalenderByTglCuti(strTglCuti);
if (idTglCuti.equals(idTanggal) && !Arrays.asList(Master.ShiftKerja.HOLIDAY).contains(idShift)) { if (idTglCuti.equals(idTanggal)
&& !Arrays.asList(Master.ShiftKerja.HOLIDAY).contains(idShift)) {
shiftKerja.setId(idShiftExec); shiftKerja.setId(idShiftExec);
break; break;
} else if (idTglCuti.equals(idTanggal) } else if (idTglCuti.equals(idTanggal)
@ -903,8 +901,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
if (idShift == 2) { if (idShift == 2) {
listShiftKerja.addAll(shiftKerjaDao.findByKelompokShiftId(1)); listShiftKerja.addAll(shiftKerjaDao.findByKelompokShiftId(1));
} }
List<PegawaiJadwalKerja> resultPegawaiJadwalKerja = pegawaiDaoCustom List<PegawaiJadwalKerja> resultPegawaiJadwalKerja = pegawaiDaoCustom.findJadwalByTanggal(tahun,
.findJadwalByTanggal(tahun, bulan, idPegawai); bulan, idPegawai);
if (resultPegawaiJadwalKerja.size() == 0) { // Apabila_jadwal_kosong if (resultPegawaiJadwalKerja.size() == 0) { // Apabila_jadwal_kosong
if (idShift == 1 || idShift == 2) { // apabila_pegawai_nonshift if (idShift == 1 || idShift == 2) { // apabila_pegawai_nonshift
@ -1104,7 +1102,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
} else if (your_os.indexOf("nix") >= 0 || your_os.indexOf("nux") >= 0 || your_os.indexOf("mac") >= 0) { } else if (your_os.indexOf("nix") >= 0 || your_os.indexOf("nux") >= 0 || your_os.indexOf("mac") >= 0) {
// if_unix_or_mac // if_unix_or_mac
absoluteFilePath = workingDir + "//tmp//" + filename; absoluteFilePath = workingDir + "//tmp//" + filename;
// absoluteFilePath = workingDir + "/" + filename; // absoluteFilePath = workingDir + "/" + filename;
} else { } else {
// unknown_os? // unknown_os?
absoluteFilePath = workingDir + "/" + filename; absoluteFilePath = workingDir + "/" + filename;