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:
@@ -148,6 +148,7 @@ public class AuditLogDto {
|
||||
private final String userName;
|
||||
private final String loginId;
|
||||
private final String menuName;
|
||||
private final String logDateTime;
|
||||
|
||||
public DailyDetail(
|
||||
Long logId,
|
||||
@@ -155,11 +156,13 @@ public class AuditLogDto {
|
||||
String loginId,
|
||||
String menuName,
|
||||
EventType eventType,
|
||||
String logDateTime,
|
||||
LogDetail detail) {
|
||||
super(logId, eventType, detail);
|
||||
this.userName = userName;
|
||||
this.loginId = loginId;
|
||||
this.menuName = menuName;
|
||||
this.logDateTime = logDateTime;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -243,6 +243,9 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
|
||||
memberEntity.employeeNo.as("loginId"),
|
||||
menuEntity.menuNm.as("menuName"),
|
||||
auditLogEntity.eventType.as("eventType"),
|
||||
Expressions.stringTemplate(
|
||||
"to_char({0}, 'YYYY-MM-DD HH:mm')", auditLogEntity.createdDate)
|
||||
.as("logDateTime"),
|
||||
Projections.constructor(
|
||||
AuditLogDto.LogDetail.class,
|
||||
Expressions.constant("한국자산관리공사"), // serviceName
|
||||
@@ -251,7 +254,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
|
||||
menuEntity.menuUrl.as("menuUrl"),
|
||||
menuEntity.description.as("menuDescription"),
|
||||
menuEntity.menuOrder.as("sortOrder"),
|
||||
menuEntity.isUse.as("used"))))
|
||||
menuEntity.isUse.as("used")))) // TODO
|
||||
.from(auditLogEntity)
|
||||
.leftJoin(menuEntity)
|
||||
.on(auditLogEntity.menuUid.eq(menuEntity.menuUid))
|
||||
|
||||
Reference in New Issue
Block a user