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

Merge branch 'dev/remun/kinerja/hapus' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-11-11 11:38:35 +07:00
commit b0253b19ad
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaDetailLogService.java
View File

@ -14,6 +14,6 @@ public interface LogbookKinerjaDetailLogService {
void save(LogbookKinerjaDetailLogReqDto dto); void save(LogbookKinerjaDetailLogReqDto dto);
Page<LogbookKinerjaDetailLogDto> list(String search, Pageable pageable); Page<LogbookKinerjaDetailLogDto> list(Pageable pageable);
} }

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

@ -67,9 +67,8 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL
} }
@Override @Override
public Page<LogbookKinerjaDetailLogDto> list(String search, Pageable pageable) { public Page<LogbookKinerjaDetailLogDto> list(Pageable pageable) {
Page<LogbookKinerjaDetailLog> logPage = logbookKinerjaDetailLogDao.findBySearchQuery(search.toLowerCase(), Page<LogbookKinerjaDetailLog> logPage = logbookKinerjaDetailLogDao.findAll(pageable);
pageable);
List<LogbookKinerjaDetailLogDto> dtoList = new ArrayList<>(); List<LogbookKinerjaDetailLogDto> dtoList = new ArrayList<>();
logPage.getContent().forEach(log -> { logPage.getContent().forEach(log -> {
LogbookKinerjaDetailLogDto.LogbookKinerjaDetailLogDtoBuilder dtoBuilder = LogbookKinerjaDetailLogDto LogbookKinerjaDetailLogDto.LogbookKinerjaDetailLogDtoBuilder dtoBuilder = LogbookKinerjaDetailLogDto

5
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
View File

@ -2858,11 +2858,10 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
@RequestMapping(value = "/catatan-kinerja/logs", method = GET) @RequestMapping(value = "/catatan-kinerja/logs", method = GET)
public ResponseEntity<Page<LogbookKinerjaDetailLogDto>> logsKinerja(HttpServletRequest request, public ResponseEntity<Page<LogbookKinerjaDetailLogDto>> logsKinerja(HttpServletRequest request,
@RequestParam(value = "search") String search, @RequestParam(value = "page") int page, @RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
@RequestParam(value = "size") int size) {
try { try {
Pageable pageable = new PageRequest(page, size); Pageable pageable = new PageRequest(page, size);
Page<LogbookKinerjaDetailLogDto> dtoPage = logbookLogService.list(search, pageable); Page<LogbookKinerjaDetailLogDto> dtoPage = logbookLogService.list(pageable);
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
getMessage(MessageResource.LABEL_SUCCESS, request)); getMessage(MessageResource.LABEL_SUCCESS, request));
return RestUtil.getJsonResponse(dtoPage, HttpStatus.OK, mapHeaderMessage); return RestUtil.getJsonResponse(dtoPage, HttpStatus.OK, mapHeaderMessage);