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

Merge branch 'dev/kepegawaian/golongan-pppk' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-02-24 15:06:56 +07:00
commit 2b0b41a640
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
View File

@ -3,10 +3,14 @@ package com.jasamedika.medifirst2000.dao;
import com.jasamedika.medifirst2000.entities.GolonganPPPK; import com.jasamedika.medifirst2000.entities.GolonganPPPK;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import java.util.Optional;
/** /**
* @author Salman * @author Salman
* @version 1.0.0 * @version 1.0.0
* @since 2/21/2025 * @since 2/21/2025
*/ */
public interface GolonganPPPKDao extends JpaRepository<GolonganPPPK, String> { public interface GolonganPPPKDao extends JpaRepository<GolonganPPPK, String> {
Optional<GolonganPPPK> findById(String id);
} }

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

@ -868,7 +868,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
+ "pegawai.noBPJS as noBPJS, " + "pegawai.noHandphone as noHandphone, " + "pegawai.noBPJS as noBPJS, " + "pegawai.noHandphone as noHandphone, "
+ "pegawai.noIdentitas as noIdentitas, " + "pegawai.noSip as noSip, " + "pegawai.noStr as noStr, " + "pegawai.noIdentitas as noIdentitas, " + "pegawai.noSip as noSip, " + "pegawai.noStr as noStr, "
+ "pegawai.noTlp as noTlp, " + "pegawai.npwp as npwp, " + "pegawai.negaraId as negaraId, " + "pegawai.noTlp as noTlp, " + "pegawai.npwp as npwp, " + "pegawai.negaraId as negaraId, "
+ "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, " + "pegawai.ruanganId as ruanganId, " + "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, "
+ "pegawai.golonganPPPKId as golonganPPPKId, " + "pegawai.ruanganId as ruanganId, "
+ "pegawai.rekananId as rekananId," + "pegawai.statusRhesus as statusRhesus, " + "pegawai.rekananId as rekananId," + "pegawai.statusRhesus as statusRhesus, "
+ "pegawai.shiftKerjaId as shiftKerjaId, " + "pegawai.statusKawinId as statusKawinId, " + "pegawai.shiftKerjaId as shiftKerjaId, " + "pegawai.statusKawinId as statusKawinId, "
+ "pegawai.sukuId as sukuId, " + "pegawai.tempatLahir as tempatLahir, " + "pegawai.sukuId as sukuId, " + "pegawai.tempatLahir as tempatLahir, "

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

@ -147,6 +147,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
@Autowired @Autowired
private RekananDao rekananDao; private RekananDao rekananDao;
@Autowired
private GolonganPPPKDao golonganPPPKDao;
@Autowired @Autowired
private PegawaiDaoCustom pegawaiDaoCustom; private PegawaiDaoCustom pegawaiDaoCustom;
@ -1895,6 +1898,10 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
} }
result.remove("pangkatId"); result.remove("pangkatId");
} }
if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) {
Optional<GolonganPPPK> byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString());
byId.ifPresent(golonganPPPK -> result.put("golonganPPPK", golonganPPPK));
}
if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) { if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) {
Map<String, Object> rekanan = rekananDao Map<String, Object> rekanan = rekananDao
.getRekananById(Integer.parseInt(result.get("rekananId").toString())); .getRekananById(Integer.parseInt(result.get("rekananId").toString()));