diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java index 8ecec7a0..1f71e395 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java @@ -19,8 +19,6 @@ import com.kamco.cd.kamcoback.changedetection.dto.ChangeDetectionDto.MapSheetLis import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status; import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceGeomEntity; import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity; -import com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity; -import com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.CaseBuilder; @@ -189,8 +187,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport .select( Projections.constructor( ChangeDetectionDto.AnalYearList.class, - a.uuid, - a.id, + l.uuid, + l.id, l.title, l.compareYyyy.as("beforeYear"), l.targetYyyy.as("afterYear"), diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java index 3dc3c6bc..03d1050b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/log/AuditLogRepositoryImpl.java @@ -305,8 +305,8 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport AuditLogDto.MenuDetail.class, auditLogEntity.id.as("logId"), Expressions.stringTemplate( - "to_char({0}, 'YYYY-MM-DD')", auditLogEntity.createdDate) - .as("logDateTime"), // ?? + "to_char({0}, 'YYYY-MM-DD HH:mm')", auditLogEntity.createdDate) + .as("logDateTime"), memberEntity.name.as("userName"), memberEntity.employeeNo.as("loginId"), auditLogEntity.eventType.as("eventType"), @@ -372,7 +372,7 @@ public class AuditLogRepositoryImpl extends QuerydslRepositorySupport AuditLogDto.UserDetail.class, auditLogEntity.id.as("logId"), Expressions.stringTemplate( - "to_char({0}, 'YYYY-MM-DD')", auditLogEntity.createdDate) + "to_char({0}, 'YYYY-MM-DD HH:mm')", auditLogEntity.createdDate) .as("logDateTime"), menuEntity.menuNm.as("menuName"), auditLogEntity.eventType.as("eventType"),