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

penerapan sotk untuk cetakan surat izin

Browse Source
This commit is contained in:
salmanoe 2021-06-21 10:50:25 +07:00
parent c113ec4a6d
commit 62cae9f3e2
2 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,7 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
public Jabatan findJabatanByIdPegawai(@Param("id") Integer id);
@Query("select peg from MapPegawaiJabatanToUnitKerja mappeg left join mappeg.pegawai peg where mappeg.pegawaiId=:idPegawai "
+ "and mappeg.jabatanId=:idJabatan and mappeg.isPrimary is true and mappeg.statusEnabled is true")
+ "and mappeg.jabatanId=:idJabatan and mappeg.statusEnabled is true")
public Pegawai findPegawaiByIdJabatanInternal(@Param("idPegawai") Integer idPegawai,
@Param("idJabatan") Integer idJabatan);
@ -536,7 +536,7 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
public List<Pegawai> findPegawaiStatusAktif(@Param("idKelompokShift") Integer idKelompokShift,
@Param("tahun") String tahun);
@Query("select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, "
String strQryJabatanCetak = "select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, "
+ "golongan.golonganPegawai as namaGolongan, " + "pegawai.noTlp as noTlp, "
+ "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, " + "pegawai.alamat as alamat, "
+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
@ -581,9 +581,18 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
+ "left join pegawai.statusPerkawinanPegawai statusPerkawinanPegawai " + "left join pegawai.suku suku "
+ "left join pegawai.titlePasien titlePasien " + "left join ruangan.departemen departemen "
+ "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true "
+ "and mappegawai.isPrimary is true " + "and mappegawai.statusEnabled is true "
+ "and pegawai.id =:idPegawai")
public Map<String, Object> findPegawaiById(@Param("idPegawai") Integer idPegawai);
+ "and mappegawai.statusEnabled is true ";
String cdtJabatanCetak = "and mappegawai.jabatanId =:jabatanId and pegawai.id =:pegawaiId";
String cdtJabatanUtamaCetak = "and mappegawai.isPrimary is true and pegawai.id =:pegawaiId";
@Query(strQryJabatanCetak + cdtJabatanUtamaCetak)
public Map<String, Object> findPegawaiById(@Param("pegawaiId") Integer idPegawai);
@Query(strQryJabatanCetak + cdtJabatanCetak)
public Map<String, Object> findPegawaiById(@Param("pegawaiId") Integer idPegawai,
@Param("jabatanId") Integer idJabatan);
// GET ALL DOKTER BY RUANGAN KERJA
@Query("select NEW Map(p.id as idPegawai,p.namaLengkap as namaPegawai,m.jabatan.id as idJabatanInternal, m.jabatan.namaJabatan as namaJabatan) "

35
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
View File

@ -64,7 +64,6 @@ import com.jasamedika.medifirst2000.dto.SuratPesananSementaraDto;
import com.jasamedika.medifirst2000.entities.Jabatan;
import com.jasamedika.medifirst2000.entities.JenisLimbahB3Masuk;
import com.jasamedika.medifirst2000.entities.LoginUser;
import com.jasamedika.medifirst2000.entities.Pegawai;
import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex;
import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus;
import com.jasamedika.medifirst2000.entities.StatusPegawai;
@ -2682,25 +2681,9 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
Integer idAtasan1 = 0;
Integer idAtasan2 = 0;
Integer kaRu = 0;
// if(CommonUtil.isNotNullOrEmpty(planningPegawaiStatus.getKeterangan()))
// {
// String[] idPenandatangan =
// planningPegawaiStatus.getKeterangan().split(",");
// idAtasan1 = Integer.valueOf(idPenandatangan[0]);
// idAtasan2 = Integer.valueOf(idPenandatangan[1]);
// kaRu = Integer.valueOf(idPenandatangan[2]);
// }
Map<String, Object> dataCuti = this.generateLapPermohonanCuti(noRecPlanning, idJabatan, idAtasan1,
idAtasan2, kaRu);
result.putAll(dataCuti);
// listTgl = planningPegawaiStatusDao
// .getListTanggalCutiApproved(planningPegawaiStatus.getNoRec());
// String tgl = "";
// for (Map<String, Object> data : listTgl) {
// tgl += new SimpleDateFormat("dd-MM-yyyy").format(data.get("tgl"))
// + ", ";
// }
// result.put("endDate", tgl);
}
PegawaiHistoriRekapIndex pegawaiHistoriRekapIndex = pegawaiHistoriRekapIndexDao
.getPegawaiHistoriRekapIndex(noRecPlanning);
@ -2710,20 +2693,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
}
if (CommonUtil.isNotNullOrEmpty(atasanId) && CommonUtil.isNotNullOrEmpty(jabatanAtasanId)) {
Pegawai pegawaiTemp = pegawaiDao.findPegawaiByIdJabatanInternal(atasanId, jabatanAtasanId);
// if (CommonUtil.isNotNullOrEmpty(pegawaiTemp)) {
// List<Pegawai> pegawaiTemps =
// pegawaiDao.findByJabatanFungsional(jabatanAtasanId);
// if (CommonUtil.isNotNullOrEmpty(pegawaiTemps)) {
// pegawaiTemp = pegawaiTemps.get(0);
// }
// }
if (CommonUtil.isNotNullOrEmpty(pegawaiTemp)) {
Map<String, Object> atasan = pegawaiDao.findPegawaiById(pegawaiTemp.getId());
result.put("namaAtasan", atasan.get("nama"));
result.put("nipAtasan", atasan.get("nipPns"));
result.put("jabatanAtasan", atasan.get("jabatanInternal"));
}
Map<String, Object> atasan = pegawaiDao.findPegawaiById(atasanId, jabatanAtasanId);
result.put("namaAtasan", atasan.get("nama"));
result.put("nipAtasan", atasan.get("nipPns"));
result.put("jabatanAtasan", atasan.get("jabatanInternal"));
}
return result;
}