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

Merge branch 'dev/pegawai/dokter-mitra' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-01-22 13:25:27 +07:00
commit 1b004a9459
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -150,7 +150,7 @@ public final class Master {
public static final Integer[] DOKTER_LUAR = { 12, 13, 19 };
public static final Integer DOKTER_TAMU = 19;
public static final Integer MITRA = 16;
public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,_mitra
public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,mitra_bank
public static final Integer[] PARUH_WAKTU = { 12, 19 };
public static final Integer PESERTA_DIDIK = 17;
public static final Integer PNS = 1;

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java
View File

@ -25,7 +25,7 @@ public interface PegawaiDaoCustom extends CoreDao<Pegawai> {
List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException);
List<Map<String, Object>> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan,
String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori);
String periode, List<Integer> listKedudukanException, List<Integer> idKategori);
List<Map<String, Object>> findAllPegawaiByJenisPegawaiPengajar();

8
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
View File

@ -726,6 +726,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Integer> listStatusPegawaiId, String periode) {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
if (CommonUtil.isNullOrEmpty(listStatusPegawaiId))
listStatusPegawaiId = splitDataSettingDatafixed("listIdKategoryPegawaiNonSdm");
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan,
listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException"));
@ -778,9 +780,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
String periode) {
Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Integer> listMitra = splitDataSettingDatafixed("listIdKategoryPegawaiMitra");
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
Collections.singletonList(Master.KategoryPegawai.MITRA));
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), listMitra);
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -886,7 +888,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"),
splitDataSettingDatafixed("listIdKategoriPesertaDidik"));
Collections.singletonList(Master.KategoryPegawai.PESERTA_DIDIK));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();