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

Merge branch 'dev/verif-remun/log' into prod/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-12-02 14:20:56 +07:00
commit 7af3521e59
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailLogServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailDao;
import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailLogDao; import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailLogDao;
import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogDto; import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogDto;
import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogReqDto; import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogReqDto;
import com.jasamedika.medifirst2000.dto.PegawaiLogDto;
import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail; import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail;
import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetailLog; import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetailLog;
import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.Pegawai;
@ -46,9 +47,6 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL
@Autowired @Autowired
private BaseConverterImpl<LogbookKinerjaDetailVO, LogbookKinerjaDetail> catatanKinerjaConverter; private BaseConverterImpl<LogbookKinerjaDetailVO, LogbookKinerjaDetail> catatanKinerjaConverter;
@Autowired
private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
@Override @Override
public void save(LogbookKinerjaDetailLogReqDto dto) { public void save(LogbookKinerjaDetailLogReqDto dto) {
LogbookKinerjaDetailLog.LogbookKinerjaDetailLogBuilder logBuilder = LogbookKinerjaDetailLog.builder(); LogbookKinerjaDetailLog.LogbookKinerjaDetailLogBuilder logBuilder = LogbookKinerjaDetailLog.builder();
@ -136,8 +134,10 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL
dtoBuilder.catatanKinerja(catatanKinerjaVO); dtoBuilder.catatanKinerja(catatanKinerjaVO);
} }
{ {
PegawaiVO pegawaiVO = pegawaiConverter.transferModelToVO(log.getPegawai(), new PegawaiVO()); PegawaiLogDto.PegawaiLogDtoBuilder builder = PegawaiLogDto.builder();
dtoBuilder.pegawai(pegawaiVO); builder.nipPns(log.getPegawai().getNipPns());
builder.namaLengkap(log.getPegawai().getNamaLengkap());
dtoBuilder.pegawai(builder.build());
} }
LogbookKinerjaDetailLogDto dto = dtoBuilder.jenisLog(log.getJenisLog()).keterangan(log.getKeterangan()) LogbookKinerjaDetailLogDto dto = dtoBuilder.jenisLog(log.getJenisLog()).keterangan(log.getKeterangan())
.tanggalDibuat(log.getTanggalDibuat()).build(); .tanggalDibuat(log.getTanggalDibuat()).build();

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/LogbookKinerjaDetailLogDto.java
View File

@ -37,6 +37,6 @@ public class LogbookKinerjaDetailLogDto {
private Date tanggalDibuat; private Date tanggalDibuat;
@Caption(value = "Pegawai") @Caption(value = "Pegawai")
private PegawaiVO pegawai; private PegawaiLogDto pegawai;
} }

23
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiLogDto.java Normal file
View File

@ -0,0 +1,23 @@
package com.jasamedika.medifirst2000.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author salmanoe
* @version 1.0.0
* @since 02/12/2024
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class PegawaiLogDto {
private String namaLengkap;
private String nipPns;
}