From 52ca40d1a98c2a5e2e855e17f5e45178a28aa372 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 27 Apr 2022 09:17:46 +0700 Subject: [PATCH] Update LogbookKinerjaDetailService Penerapan mekanisme setting data fix untuk pengaturan tgl batas akhir verifikasi catatan kegiatan harian --- .../impl/LogbookKinerjaDetailServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java index 3e969cea..bfb82d9d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java @@ -22,6 +22,7 @@ import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.LogbookKinerjaDao; import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailDao; +import com.jasamedika.medifirst2000.dao.SettingDataFixedDao; import com.jasamedika.medifirst2000.entities.LogbookKinerja; import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail; import com.jasamedika.medifirst2000.exception.ServiceVOException; @@ -35,6 +36,9 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement @Autowired private BaseConverterImpl logbookKinerjaDetailConverter; + @Autowired + private SettingDataFixedDao settingDataFixedDao; + @Autowired private LogbookKinerjaDao logbookKinerjaDao; @@ -48,12 +52,11 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement 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)) { /** @@ -71,7 +74,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement } logbookKinerjaDao.save(models); } - + /** * menghitung capaian indikator satuan yang harus dihitung secara * rata-rata @@ -188,8 +191,10 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement public List> findWorkingRecord(Integer idPegawai, Integer idJabatan, Long bulan, Boolean statusVerif) throws JpaSystemException { DateFormat df = new SimpleDateFormat("yyyy-MM"); + + String strTglLimitVerif = settingDataFixedDao.getSettingDataFixed("tglLimitVerifWorkingRecord"); LocalDateTime tglLimitVerif = LocalDateTime - .of(LocalDate.parse(df.format(new Date(bulan)) + "-04").plusMonths(1), LocalTime.MAX); + .of(LocalDate.parse(df.format(new Date(bulan)) + strTglLimitVerif).plusMonths(1), LocalTime.MAX); List> result = logbookKinerjaDetailDao.findWorkingRecord(idPegawai, idJabatan, df.format(new Date(bulan)), statusVerif);