Merge pull request '로그관리 - 일자별 상세에도 시,분까지 표기 추가' (#346) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/346
This commit is contained in:
2026-01-26 14:32:31 +09:00
2 changed files with 7 additions and 1 deletions

View File

@@ -148,6 +148,7 @@ public class AuditLogDto {
private final String userName; private final String userName;
private final String loginId; private final String loginId;
private final String menuName; private final String menuName;
private final String logDateTime;
public DailyDetail( public DailyDetail(
Long logId, Long logId,
@@ -155,11 +156,13 @@ public class AuditLogDto {
String loginId, String loginId,
String menuName, String menuName,
EventType eventType, EventType eventType,
String logDateTime,
LogDetail detail) { LogDetail detail) {
super(logId, eventType, detail); super(logId, eventType, detail);
this.userName = userName; this.userName = userName;
this.loginId = loginId; this.loginId = loginId;
this.menuName = menuName; this.menuName = menuName;
this.logDateTime = logDateTime;
} }
} }

View File

@@ -243,6 +243,9 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
memberEntity.employeeNo.as("loginId"), memberEntity.employeeNo.as("loginId"),
menuEntity.menuNm.as("menuName"), menuEntity.menuNm.as("menuName"),
auditLogEntity.eventType.as("eventType"), auditLogEntity.eventType.as("eventType"),
Expressions.stringTemplate(
"to_char({0}, 'YYYY-MM-DD HH:mm')", auditLogEntity.createdDate)
.as("logDateTime"),
Projections.constructor( Projections.constructor(
AuditLogDto.LogDetail.class, AuditLogDto.LogDetail.class,
Expressions.constant("한국자산관리공사"), // serviceName Expressions.constant("한국자산관리공사"), // serviceName
@@ -251,7 +254,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
menuEntity.menuUrl.as("menuUrl"), menuEntity.menuUrl.as("menuUrl"),
menuEntity.description.as("menuDescription"), menuEntity.description.as("menuDescription"),
menuEntity.menuOrder.as("sortOrder"), menuEntity.menuOrder.as("sortOrder"),
menuEntity.isUse.as("used")))) menuEntity.isUse.as("used")))) // TODO
.from(auditLogEntity) .from(auditLogEntity)
.leftJoin(menuEntity) .leftJoin(menuEntity)
.on(auditLogEntity.menuUid.eq(menuEntity.menuUid)) .on(auditLogEntity.menuUid.eq(menuEntity.menuUid))