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

Merge branch 'master' into prod-deploy

Browse Source
This commit is contained in:
Salman Manoe 2023-12-01 10:24:00 +07:00
commit 9483ad3e54
3 changed files with 45 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDetailDao.java
View File

@ -1,15 +1,14 @@
package com.jasamedika.medifirst2000.dao;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Repository("logbookKinerjaDetailDao")
public interface LogbookKinerjaDetailDao extends PagingAndSortingRepository<LogbookKinerjaDetail, String> {

98
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java
View File

@ -1,23 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.constants.Master;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.LogbookKinerjaDao;
@ -30,6 +12,17 @@ import com.jasamedika.medifirst2000.service.LogbookKinerjaDetailService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.util.DateUtil;
import com.jasamedika.medifirst2000.vo.LogbookKinerjaDetailVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.util.*;
@Service("LogbookKinerjaDetailService")
public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implements LogbookKinerjaDetailService {
@ -49,18 +42,13 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
@Override
public LogbookKinerjaDetailVO add(LogbookKinerjaDetailVO vo) throws JpaSystemException, ServiceVOException {
LogbookKinerja logbookKinerja = logbookKinerjaDao.findOne(vo.getLogbookKinerja().getNoRec());
LogbookKinerjaDetail logbookKinerjaDetail = logbookKinerjaDetailConverter.transferVOToModel(vo,
new LogbookKinerjaDetail());
logbookKinerjaDetail.setLogbookKinerja(logbookKinerja);
logbookKinerjaDetail.setTanggalKegiatan(new Date());
logbookKinerjaDao.save(logbookKinerja);
LogbookKinerjaDetail resultModel = logbookKinerjaDetailDao.save(logbookKinerjaDetail);
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
/**
/*
* menghitung capaian indikator satuan yang harus dihitung secara
* akumulatif
*/
@ -75,8 +63,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
}
logbookKinerjaDao.save(models);
}
/**
/*
* menghitung capaian indikator satuan yang harus dihitung secara
* rata-rata
*/
@ -92,10 +79,8 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
logbookKinerjaDao.save(models);
}
}
LogbookKinerjaDetailVO resultVO = new LogbookKinerjaDetailVO();
resultVO = logbookKinerjaDetailConverter.transferModelToVO(resultModel, resultVO);
return resultVO;
}
@ -103,30 +88,30 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
public LogbookKinerjaDetailVO update(LogbookKinerjaDetailVO vo) throws JpaSystemException, ServiceVOException {
LogbookKinerja logbookKinerja = logbookKinerjaDao.findOne(vo.getLogbookKinerja().getNoRec());
LogbookKinerjaDetail logbookKinerjaDetailLama = logbookKinerjaDetailDao.findOne(vo.getNoRec());
/**
* menghitung indikator capaian satuan yang harus dihitung secara
* akumulatif
*/
if (!vo.getStatusEnabled() && !vo.getStatusVerifikasi()) {
logbookKinerja.setCapaian(logbookKinerja.getCapaian() - vo.getCapaian());
} else if (vo.getStatusEnabled() && vo.getStatusVerifikasi()) {
logbookKinerja.setCapaian(logbookKinerja.getCapaian() + vo.getCapaian());
}
LogbookKinerjaDetail logbookKinerjaDetailBaru = logbookKinerjaDetailConverter.transferVOToModel(vo,
logbookKinerjaDetailLama);
logbookKinerjaDetailBaru.setLogbookKinerja(logbookKinerja);
logbookKinerjaDao.save(logbookKinerja);
LogbookKinerjaDetail resultModel = logbookKinerjaDetailDao.save(logbookKinerjaDetailBaru);
/**
* menghitung capaian indikator satuan yang harus dihitung secara
* rata-rata
*/
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
/*
* menghitung capaian indikator satuan yang harus dihitung secara
* akumulatif
*/
List<Map<String, Object>> dataSatuanJumlah = logbookKinerjaDetailDao.findSumCapaianByKontrak(
vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.PERCENTAGE));
if (CommonUtil.isNotNullOrEmpty(dataSatuanJumlah)) {
List<LogbookKinerja> models = new ArrayList<>();
for (Map<String, Object> map : dataSatuanJumlah) {
LogbookKinerja model = logbookKinerjaDao.findOne(map.get("logbookId").toString());
model.setCapaian(Double.valueOf(map.get("sumCapaian").toString()));
models.add(model);
}
logbookKinerjaDao.save(models);
}
/*
* menghitung capaian indikator satuan yang harus dihitung secara
* rata-rata
*/
List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak(
vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.PERCENTAGE));
if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) {
@ -139,10 +124,8 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
logbookKinerjaDao.save(models);
}
}
LogbookKinerjaDetailVO resultVO = new LogbookKinerjaDetailVO();
resultVO = logbookKinerjaDetailConverter.transferModelToVO(resultModel, resultVO);
return resultVO;
}
@ -167,7 +150,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
@Override
public List<LogbookKinerjaDetailVO> findAll() throws JpaSystemException {
List<LogbookKinerjaDetailVO> result = new ArrayList<LogbookKinerjaDetailVO>();
List<LogbookKinerjaDetailVO> result = new ArrayList<>();
Iterable<LogbookKinerjaDetail> models = logbookKinerjaDetailDao.findAll();
if (CommonUtil.isNotNullOrEmpty(models)) {
@ -202,7 +185,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
List<Map<String, Object>> result = logbookKinerjaDetailDao.findWorkingRecord(idPegawai, idJabatan, start, end,
statusVerif);
for (Map<String, Object> map : result) {
Map<String, Object> logbook = new HashMap<String, Object>();
Map<String, Object> logbook = new HashMap<>();
logbook.put("noRec", map.get("logbookNoRec"));
map.put("logbookKinerja", logbook);
map.put("tglBatasAkhirVerif", Date.from(tglLimitVerif.atZone(ZoneId.systemDefault()).toInstant()));
@ -221,7 +204,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
List<Map<String, Object>> result = logbookKinerjaDetailDao.findWorkingRecord(idPegawai, idJabatan, idIndikator,
start, end);
for (Map<String, Object> map : result) {
Map<String, Object> logbook = new HashMap<String, Object>();
Map<String, Object> logbook = new HashMap<>();
logbook.put("noRec", map.get("logbookNoRec"));
map.put("logbookKinerja", logbook);
map.remove("logbookNoRec");
@ -250,15 +233,14 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
DateFormat mf = new SimpleDateFormat("yyyy-MM");
List<Integer> listKategoriPegawaiWorkingRecord = new ArrayList<>();
listKategoriPegawaiWorkingRecord.addAll(Arrays.asList(Master.KategoryPegawai.REMUN));
List<Integer> listKategoriPegawaiWorkingRecord = new ArrayList<>(Arrays.asList(Master.KategoryPegawai.REMUN));
listKategoriPegawaiWorkingRecord.add(Master.KategoryPegawai.BLU_PKWT);
List<Map<String, Object>> tugasVerifikasi = logbookKinerjaDetailDao.findVerifWorkingRecord(idPegawai,
mf.format(new Date(bulan)), listKategoriPegawaiWorkingRecord, Arrays.asList(Master.UnitKerja.KSM));
if (CommonUtil.isNotNullOrEmpty(tugasVerifikasi) && tugasVerifikasi.size() == 2) {
for (Map<String, Object> tv : tugasVerifikasi) {
if (Boolean.valueOf(tv.get("statusVerifikasi").toString())) {
if (Boolean.parseBoolean(tv.get("statusVerifikasi").toString())) {
rsMap1.put("sudahDiverifikasi", tv.get("jumlah"));
} else {
rsMap1.put("belumDiverifikasi", tv.get("jumlah"));
@ -266,7 +248,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
}
} else if (CommonUtil.isNotNullOrEmpty(tugasVerifikasi) && tugasVerifikasi.size() == 1) {
for (Map<String, Object> tv : tugasVerifikasi) {
if (Boolean.valueOf(tv.get("statusVerifikasi").toString())) {
if (Boolean.parseBoolean(tv.get("statusVerifikasi").toString())) {
rsMap1.put("sudahDiverifikasi", tv.get("jumlah"));
rsMap1.put("belumDiverifikasi", 0);
} else {
@ -284,7 +266,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
mf.format(new Date(bulan)), listKategoriPegawaiWorkingRecord);
if (CommonUtil.isNotNullOrEmpty(statusVerifikasi) && statusVerifikasi.size() == 2) {
for (Map<String, Object> sv : statusVerifikasi) {
if (Boolean.valueOf(sv.get("statusVerifikasi").toString())) {
if (Boolean.parseBoolean(sv.get("statusVerifikasi").toString())) {
rsMap2.put("sudahDiverifikasi", sv.get("jumlah"));
} else {
rsMap2.put("belumDiverifikasi", sv.get("jumlah"));
@ -292,7 +274,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
}
} else if (CommonUtil.isNotNullOrEmpty(statusVerifikasi) && statusVerifikasi.size() == 1) {
for (Map<String, Object> sv : statusVerifikasi) {
if (Boolean.valueOf(sv.get("statusVerifikasi").toString())) {
if (Boolean.parseBoolean(sv.get("statusVerifikasi").toString())) {
rsMap2.put("sudahDiverifikasi", sv.get("jumlah"));
rsMap2.put("belumDiverifikasi", 0);
} else {

4
jasamedika-core/pom.xml
View File

@ -62,7 +62,7 @@
<artifactId>specification-arg-resolver</artifactId>
<version>0.9.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.itextpdf.tool/xmlworker -->
<dependency>
<groupId>com.itextpdf.tool</groupId>
@ -76,8 +76,6 @@
<artifactId>itextpdf</artifactId>
<version>5.5.9</version>
</dependency>
</dependencies>
<organization>
<name>Jasa Medika</name>