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

Merge branch 'dev/pegawai/peserta-didik' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-01-15 09:55:17 +07:00
commit 4c6b8d5cc9
6 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
package com.jasamedika.medifirst2000.dao.custom;
import java.util.List;
import java.util.Map;
import com.jasamedika.medifirst2000.dao.custom.base.CoreDao;
import com.jasamedika.medifirst2000.entities.Pegawai;
import com.jasamedika.medifirst2000.entities.PegawaiJadwalKerja;
import java.util.List;
import java.util.Map;
/**
*
* @author Roberto
@ -25,9 +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, Integer idKategori);
List<Map<String, Object>> findPegawaiByNamePesertaDidik(String namaPegawai);
String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori);
List<Map<String, Object>> findAllPegawaiByJenisPegawaiPengajar();

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

@ -114,34 +114,6 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
return list;
}
@Override
public List<Map<String, Object>> findPegawaiByNamePesertaDidik(String namaPegawai) {
StringBuffer buffer = new StringBuffer();
buffer.append(" select ");
buffer.append(" new map");
buffer.append(" ( ");
buffer.append(" p.nipPns , p.namaLengkap ,p.tglLahir , " + "p.tempatLahir , p.noHandphone," + "p.alamat , "
+ "jabatanInternal.kdJabatan,jabatanInternal.namaJabatan, " + "golongan.id,golongan.golonganPegawai, "
+ " statusKawin.statusPerkawinan, statusKawin.id, " + "agama.agama, agama.kdAgama, "
+ " satuanKerja.kdSatuanKerja,satuanKerja.satuanKerja , "
+ " jabatanStruktural.kdJabatan ,jabatanStruktural.namaJabatan, "
+ " jenisKelamin.jenisKelamin,jenisKelamin.id,"
+ " jabatanFungsional.kdJabatan ,jabatanFungsional.namaJabatan");
buffer.append(" ) ");
buffer.append("from Pegawai p " + " left join p.jabatanInternal jabatanInternal"
+ " left join p.golonganPegawai golongan " + " left join p.statusKawin statusKawin "
+ " left join p.agama agama " + " left join p.satuanKerja satuanKerja "
+ " left join p.jabatanStruktural jabatanStruktural "
+ " left join p.jabatanFungsional jabatanFungsional " + " left join p.jenisKelamin jenisKelamin "
+ " where lower (p.namaLengkap) like lower ('%" + namaPegawai + "%') " + " order by p.namaLengkap ");
Query query = em.createQuery(buffer.toString());
List<Map<String, Object>> list = query.getResultList();
return list;
}
@Override
public List<Map<String, Object>> findAllPegawaiByJenisPegawaiPengajar() {
StringBuffer buffer = new StringBuffer();
@ -452,7 +424,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
@Override
public List<Map<String, Object>> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan,
String periode, List<Integer> listKedudukanException, Integer idKategori) {
String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori) {
StringBuffer buffer = new StringBuffer();
buffer.append("select new map (pegawai.id as idPegawai," + "pegawai.nama as nama,"
@ -516,7 +488,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
+ "left join pegawai.statusPegawai statusPegawai " + "left join pegawai.statusKawin statusKawin "
+ "left join pegawai.statusPerkawinanPegawai statusPerkawinanPegawai " + "left join pegawai.suku suku "
+ "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true "
+ "and kategoriPegawai.id = :idKategori ");
+ "and kategoriPegawai.id in (:listIdKategori) ");
if (CommonUtil.isNotNullOrEmpty(nama)) {
buffer.append("and lower(pegawai.nama) like lower ('%" + nama + "%') ");
@ -538,7 +510,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
Query query = em.createQuery(buffer.toString());
query.setParameter("idKategori", idKategori);
query.setParameter("listIdKategori", listIdKategori);
if (CommonUtil.isNotNullOrEmpty(idUnitKerja)) {
List<Integer> listPegawaiByUnitKerja = pegawaiDao.getPegawaiByIdUnitKerja(idUnitKerja);

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

@ -780,7 +780,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"),
Master.KategoryPegawai.MITRA);
Collections.singletonList(Master.KategoryPegawai.MITRA));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -833,7 +833,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"),
Master.KategoryPegawai.DOKTER_TAMU);
Collections.singletonList(Master.KategoryPegawai.DOKTER_TAMU));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();
@ -886,7 +886,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"),
Master.KategoryPegawai.PESERTA_DIDIK);
splitDataSettingDatafixed("listIdKategoriPesertaDidik"));
for (Map<String, Object> map : resultModel) {
Map<String, Object> usernames = new HashMap<>();

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

@ -178,7 +178,8 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
List<Integer> kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed("kategoriPegawaiAksesAplikasiRemun");
List<Integer> kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed(
"kategoriPegawaiAksesAplikasiRemun");
if (CommonUtil.isNotNullOrEmpty(vo.getId())) {
pegawai = rekamDataPegawaiDao.findOne(vo.getId());
Integer idJabatanUtama = mapPegawaiJabatanToUnitkerjaDao.getIdJabatanInternalUtamaByIdPegawai(vo.getId());
@ -1253,6 +1254,19 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
pegawai.setRekanan(null);
perubahan += "hapus perusahaan mitra, ";
}
if (CommonUtil.isNotNullOrEmpty(pegawai.getNim()) && CommonUtil.isNotNullOrEmpty(vo.getNim())) {
if (!pegawai.getNim().equals(vo.getNim())) {
pegawai.setNim(vo.getNim());
perubahan += "ubah nim, ";
}
} else if (CommonUtil.isNullOrEmpty(pegawai.getNim()) && CommonUtil.isNotNullOrEmpty(vo.getNim())) {
pegawai.setNim(vo.getNim());
perubahan += "nim, ";
} else if (CommonUtil.isNotNullOrEmpty(pegawai.getNim()) && CommonUtil.isNullOrEmpty(vo.getNim())) {
pegawai.setNim(vo.getNim());
perubahan += "hapus nim, ";
}
} else {
pegawai.setKdProfile(Master.KODE_PROFILE);
pegawai.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
@ -1526,6 +1540,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
pegawai.setRekanan(rekananConverter.transferVOToModel(vo.getRekanan(), new Rekanan()));
perubahan += "perusahaan mitra, ";
}
if (CommonUtil.isNotNullOrEmpty(vo.getNim())) {
pegawai.setNim(vo.getNim());
perubahan += "nim, ";
}
}
if (CommonUtil.isNullOrEmpty(perubahan)) {

3
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pegawai.java
View File

@ -611,4 +611,7 @@ public class Pegawai extends BaseMasterPegawai {
@Column(name = "ObjectPegawaiPembimbingFk", insertable = false, updatable = false)
private Integer pegawaiPembimbingId;
@Column(name = "nim", length = 32)
private String nim;
}

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekamDataPegawaiVO.java
View File

@ -278,4 +278,6 @@ public class RekamDataPegawaiVO extends BaseTransactionVO {
private Boolean isMenanggung;
private List<MapPegawaiJabatanToUnitKerjaVO> mappingJabatan;
private String nim;
}