Merge pull request '로그관리 목록 API 수정 + spotless' (#337) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/337
This commit is contained in:
2026-01-23 20:44:48 +09:00
2 changed files with 7 additions and 16 deletions

View File

@@ -98,7 +98,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
.from(auditLogEntity) .from(auditLogEntity)
.leftJoin(menuEntity) .leftJoin(menuEntity)
.on(auditLogEntity.menuUid.eq(menuEntity.menuUid)) .on(auditLogEntity.menuUid.eq(menuEntity.menuUid))
.where(menuNameEquals(searchValue)) .where(auditLogEntity.menuUid.ne("SYSTEM"), menuNameEquals(searchValue))
.groupBy(auditLogEntity.menuUid) .groupBy(auditLogEntity.menuUid)
.offset(pageable.getOffset()) .offset(pageable.getOffset())
.limit(pageable.getPageSize()) .limit(pageable.getPageSize())
@@ -139,7 +139,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport
.from(auditLogEntity) .from(auditLogEntity)
.leftJoin(memberEntity) .leftJoin(memberEntity)
.on(auditLogEntity.userUid.eq(memberEntity.id)) .on(auditLogEntity.userUid.eq(memberEntity.id))
.where(loginIdOrUsernameContains(searchValue)) .where(auditLogEntity.userUid.isNotNull(), loginIdOrUsernameContains(searchValue))
.groupBy(auditLogEntity.userUid, memberEntity.employeeNo, memberEntity.name) .groupBy(auditLogEntity.userUid, memberEntity.employeeNo, memberEntity.name)
.offset(pageable.getOffset()) .offset(pageable.getOffset())
.limit(pageable.getPageSize()) .limit(pageable.getPageSize())

View File

@@ -13,12 +13,9 @@ public class MapSheetMngFileJobController {
private final MapSheetMngFileJobService mapSheetMngFileJobService; private final MapSheetMngFileJobService mapSheetMngFileJobService;
// 현재 상태 확인용 Getter // 현재 상태 확인용 Getter
@Getter @Getter private boolean isSchedulerEnabled = false;
private boolean isSchedulerEnabled = false; @Getter private boolean isFileSyncSchedulerEnabled = false;
@Getter @Getter private int mngSyncPageSize = 20;
private boolean isFileSyncSchedulerEnabled = false;
@Getter
private int mngSyncPageSize = 20;
// 파일싱크 진행여부 확인하기 // 파일싱크 진행여부 확인하기
@Scheduled(fixedDelay = 1000 * 10) @Scheduled(fixedDelay = 1000 * 10)
@@ -33,17 +30,11 @@ public class MapSheetMngFileJobController {
mng = mapSheetMngFileJobService.checkMngFileSync(); mng = mapSheetMngFileJobService.checkMngFileSync();
this.isFileSyncSchedulerEnabled = true; this.isFileSyncSchedulerEnabled = true;
System.out.println( System.out.println(
"MngFileSyncJob --> mngYyyy : " "MngFileSyncJob --> mngYyyy : " + mng + ", currentTime : " + System.currentTimeMillis());
+ mng
+ ", currentTime : "
+ System.currentTimeMillis());
} else { } else {
this.isFileSyncSchedulerEnabled = false; this.isFileSyncSchedulerEnabled = false;
System.out.println( System.out.println(
"MngFileSyncJob --> mngYyyy : " "MngFileSyncJob --> mngYyyy : " + mng + ", currentTime : " + System.currentTimeMillis());
+ mng
+ ", currentTime : "
+ System.currentTimeMillis());
} }
} }