Update service logbook kinerja
Penerapan synchronized method untuk hitung akumulasi capaian entri working record
This commit is contained in:
parent
fe15bd14ab
commit
6006e2ceb7
@ -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;
|
||||
@ -29,7 +11,19 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
|
||||
import com.jasamedika.medifirst2000.service.LogbookKinerjaDetailService;
|
||||
import com.jasamedika.medifirst2000.util.CommonUtil;
|
||||
import com.jasamedika.medifirst2000.util.DateUtil;
|
||||
import com.jasamedika.medifirst2000.util.DoubleCounter;
|
||||
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 {
|
||||
@ -60,7 +54,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
|
||||
|
||||
LogbookKinerjaDetail resultModel = logbookKinerjaDetailDao.save(logbookKinerjaDetail);
|
||||
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
|
||||
/**
|
||||
/*
|
||||
* menghitung capaian indikator satuan yang harus dihitung secara
|
||||
* akumulatif
|
||||
*/
|
||||
@ -76,7 +70,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
|
||||
logbookKinerjaDao.save(models);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* menghitung capaian indikator satuan yang harus dihitung secara
|
||||
* rata-rata
|
||||
*/
|
||||
@ -104,14 +98,18 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
|
||||
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());
|
||||
DoubleCounter capaianSubstracted = new DoubleCounter(logbookKinerja.getCapaian());
|
||||
capaianSubstracted.add(vo.getCapaian());
|
||||
logbookKinerja.setCapaian(capaianSubstracted.getResult());
|
||||
} else if (vo.getStatusEnabled() && vo.getStatusVerifikasi()) {
|
||||
logbookKinerja.setCapaian(logbookKinerja.getCapaian() + vo.getCapaian());
|
||||
DoubleCounter capaianAdded = new DoubleCounter(logbookKinerja.getCapaian());
|
||||
capaianAdded.add(vo.getCapaian());
|
||||
logbookKinerja.setCapaian(capaianAdded.getResult());
|
||||
}
|
||||
|
||||
LogbookKinerjaDetail logbookKinerjaDetailBaru = logbookKinerjaDetailConverter.transferVOToModel(vo,
|
||||
@ -122,7 +120,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
|
||||
logbookKinerjaDao.save(logbookKinerja);
|
||||
LogbookKinerjaDetail resultModel = logbookKinerjaDetailDao.save(logbookKinerjaDetailBaru);
|
||||
|
||||
/**
|
||||
/*
|
||||
* menghitung capaian indikator satuan yang harus dihitung secara
|
||||
* rata-rata
|
||||
*/
|
||||
@ -167,7 +165,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 +200,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 +219,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 +248,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 +263,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 +281,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 +289,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 {
|
||||
|
||||
@ -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>
|
||||
@ -77,6 +77,13 @@
|
||||
<version>5.5.9</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${project.lombok.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<organization>
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
package com.jasamedika.medifirst2000.util;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
|
||||
/**
|
||||
* @author salmanoe
|
||||
* @version 1.0.0
|
||||
* @since 01/12/2023
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
public class DoubleCounter {
|
||||
|
||||
private double result;
|
||||
|
||||
public synchronized void add(double x) {
|
||||
result += x;
|
||||
}
|
||||
|
||||
public synchronized void substract(double x) {
|
||||
result -= x;
|
||||
}
|
||||
|
||||
public synchronized double getResult() {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user