diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailLogServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailLogServiceImpl.java index df05b468..2c8c6265 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailLogServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailLogServiceImpl.java @@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailDao; import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailLogDao; import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogDto; import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogReqDto; +import com.jasamedika.medifirst2000.dto.PegawaiLogDto; import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail; import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetailLog; import com.jasamedika.medifirst2000.entities.Pegawai; @@ -46,9 +47,6 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL @Autowired private BaseConverterImpl catatanKinerjaConverter; - @Autowired - private BaseConverterImpl pegawaiConverter; - @Override public void save(LogbookKinerjaDetailLogReqDto dto) { LogbookKinerjaDetailLog.LogbookKinerjaDetailLogBuilder logBuilder = LogbookKinerjaDetailLog.builder(); @@ -136,8 +134,10 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL dtoBuilder.catatanKinerja(catatanKinerjaVO); } { - PegawaiVO pegawaiVO = pegawaiConverter.transferModelToVO(log.getPegawai(), new PegawaiVO()); - dtoBuilder.pegawai(pegawaiVO); + PegawaiLogDto.PegawaiLogDtoBuilder builder = PegawaiLogDto.builder(); + builder.nipPns(log.getPegawai().getNipPns()); + builder.namaLengkap(log.getPegawai().getNamaLengkap()); + dtoBuilder.pegawai(builder.build()); } LogbookKinerjaDetailLogDto dto = dtoBuilder.jenisLog(log.getJenisLog()).keterangan(log.getKeterangan()) .tanggalDibuat(log.getTanggalDibuat()).build(); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/LogbookKinerjaDetailLogDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/LogbookKinerjaDetailLogDto.java index 6c6a68c8..767dc0cd 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/LogbookKinerjaDetailLogDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/LogbookKinerjaDetailLogDto.java @@ -37,6 +37,6 @@ public class LogbookKinerjaDetailLogDto { private Date tanggalDibuat; @Caption(value = "Pegawai") - private PegawaiVO pegawai; + private PegawaiLogDto pegawai; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiLogDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiLogDto.java new file mode 100644 index 00000000..3426bb82 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiLogDto.java @@ -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; + +}