diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index 3509c8b4..5fa407e1 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -23,6 +23,8 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import java.time.LocalDate; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.UUID; @@ -111,10 +113,23 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport && !searchReq.getStrtDttm().isEmpty() && searchReq.getEndDttm() != null && !searchReq.getEndDttm().isEmpty()) { + + ZoneId zoneId = ZoneId.of("Asia/Seoul"); + + ZonedDateTime start = + LocalDate.parse(searchReq.getStrtDttm(), DateTimeFormatter.BASIC_ISO_DATE) + .atStartOfDay(zoneId); + + ZonedDateTime end = + LocalDate.parse(searchReq.getEndDttm(), DateTimeFormatter.BASIC_ISO_DATE) + .plusDays(1) + .atStartOfDay(zoneId); + whereSubBuilder.and( - Expressions.stringTemplate( - "to_char({0}, 'YYYYMMDD')", mapSheetAnalDataInferenceGeomEntity.labelStateDttm) - .between(searchReq.getStrtDttm(), searchReq.getEndDttm())); + mapSheetAnalDataInferenceGeomEntity + .labelStateDttm + .goe(start) + .and(mapSheetAnalDataInferenceGeomEntity.labelStateDttm.lt(end))); } List foundContent =