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

Merge remote-tracking branch 'origin/dev/pegawai/dokter-mitra' into dev/base

Browse Source
This commit is contained in:
Salman Manoe 2025-02-03 09:45:38 +07:00
commit 6803ffe11b
2 changed files with 5 additions and 4 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_LUAR = { 12, 13, 19 };
public static final Integer DOKTER_TAMU = 19; public static final Integer DOKTER_TAMU = 19;
public static final Integer MITRA = 16; 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[] PARUH_WAKTU = { 12, 19 };
public static final Integer PNS = 1; public static final Integer PNS = 1;
public static final Integer[] REMUN = { 1, 10, 14, 21 }; public static final Integer[] REMUN = { 1, 10, 14, 21 };

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

@ -727,6 +727,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Integer> listStatusPegawaiId, String periode) { List<Integer> listStatusPegawaiId, String periode) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>(); List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
if (CommonUtil.isNullOrEmpty(listStatusPegawaiId))
listStatusPegawaiId = splitDataSettingDatafixed("listIdKategoryPegawaiNonSdm");
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan, List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan,
listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException")); listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException"));
@ -779,10 +781,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
String periode) { String periode) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
List<Map<String, Object>> resultModelWithUsername = new ArrayList<>(); List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
List<Integer> listMitra = splitDataSettingDatafixed("listIdKategoryPegawaiMitra");
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja, List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), listMitra);
Collections.singletonList(Master.KategoryPegawai.MITRA));
for (Map<String, Object> map : resultModel) { for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>(); Map<String, Object> usernames = new HashMap<>();
Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString()); Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString());