Merge branch 'feat/infer_dev_260107' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107
This commit is contained in:
@@ -167,12 +167,14 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
|
|||||||
BooleanBuilder whereBuilder = new BooleanBuilder();
|
BooleanBuilder whereBuilder = new BooleanBuilder();
|
||||||
|
|
||||||
whereBuilder.and(auditLogEntity.eventStatus.ne(EventStatus.valueOf("FAILED")));
|
whereBuilder.and(auditLogEntity.eventStatus.ne(EventStatus.valueOf("FAILED")));
|
||||||
|
whereBuilder.and(auditLogEntity.eventType.eq(EventType.valueOf("DOWNLOAD")));
|
||||||
|
|
||||||
if (req.getMenuId() != null && !req.getMenuId().isEmpty()) {
|
if (req.getMenuId() != null && !req.getMenuId().isEmpty()) {
|
||||||
whereBuilder.and(auditLogEntity.menuUid.eq(req.getMenuId()));
|
whereBuilder.and(auditLogEntity.menuUid.eq(req.getMenuId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (req.getUuid() != null) {
|
if (req.getUuid() != null) {
|
||||||
|
whereBuilder.and(auditLogEntity.requestUri.contains("/api/inference/download/"));
|
||||||
whereBuilder.and(auditLogEntity.requestUri.endsWith(String.valueOf(req.getUuid())));
|
whereBuilder.and(auditLogEntity.requestUri.endsWith(String.valueOf(req.getUuid())));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,7 +200,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
|
|||||||
.where(whereBuilder, createdDateBetween(req.getStartDate(), req.getEndDate()))
|
.where(whereBuilder, createdDateBetween(req.getStartDate(), req.getEndDate()))
|
||||||
.offset(pageable.getOffset())
|
.offset(pageable.getOffset())
|
||||||
.limit(pageable.getPageSize())
|
.limit(pageable.getPageSize())
|
||||||
// .orderBy(auditLogEntity.eventEndedAt.max().desc())
|
.orderBy(auditLogEntity.createdDate.desc())
|
||||||
.fetch();
|
.fetch();
|
||||||
|
|
||||||
Long countQuery =
|
Long countQuery =
|
||||||
|
|||||||
Reference in New Issue
Block a user