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 prod/base

Browse Source
This commit is contained in:
Salman Manoe 2025-02-03 11:59:47 +07:00
commit 1a21be43ab
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,8 @@ public interface PegawaiDaoCustom extends CoreDao<Pegawai> {
List<Integer> listStatusPegawai, List<Integer> listKedudukan);
List<Map<String, Object>> findPegawaiCustom(String nama, Integer idUnitKerja, Integer idKedudukan,
List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException);
List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException,
List<Integer> listStatusPegawaiException);
List<Map<String, Object>> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan,
String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori);

5
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
View File

@ -273,7 +273,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
@Override
public List<Map<String, Object>> findPegawaiCustom(String nama, Integer idUnitKerja, Integer idKedudukan,
List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException) {
List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException,
List<Integer> listStatusPegawaiException) {
StringBuffer buffer = new StringBuffer();
List<Map<String, Object>> list = new ArrayList<>();
@ -397,7 +398,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
query.setParameter("listAdmin", listAdmin);
if (CommonUtil.isNullOrEmpty(listStatusPegawaiId)) {
query.setParameter("nonSdmKategory", Arrays.asList(Master.KategoryPegawai.NONSDM));
query.setParameter("nonSdmKategory", listStatusPegawaiException);
}
if (CommonUtil.isNotNullOrEmpty(idUnitKerja) && CommonUtil.isNotNullOrEmpty(listPegawaiByUnitKerja)

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

@ -727,10 +727,9 @@ 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"));
listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException"),
splitDataSettingDatafixed("listIdKategoryPegawaiNonSdm"));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -784,7 +783,6 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
List<Integer> listMitra = splitDataSettingDatafixed("listIdKategoryPegawaiMitra");
List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustomByKategori(nama, idUnitKerja,
idKedudukan, periode, splitDataSettingDatafixed("listDataKedudukanException"), listMitra);
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
Integer idPegawai = Integer.parseInt(map.get("idPegawai").toString());