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

Update ReportServiceImpl.java

Browse Source 
Perbaikan validasi golongan pegawai di service report
This commit is contained in:
Salman Manoe 2023-11-20 16:15:08 +07:00
parent c302274562
commit a6b7c4eb8f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -1929,8 +1929,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId)
|| Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId)
|| Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) {
if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan"))
&& Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
@ -1953,8 +1954,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
}
} else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId)
|| Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) {
if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan"))
&& Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
@ -2138,8 +2140,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId)
|| Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId)
|| Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) {
if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan"))
&& Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];
@ -2162,8 +2165,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
}
} else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId)
|| Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) {
if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
if (CommonUtil.isNotNullOrEmpty(pegawai.get("idGolongan"))
&& Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
String[] arrCutiA1 = cutiA1.split("_");
labelTtdMenkes = arrCutiA1[0];