diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index 6a398fef..2a81a762 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -19,7 +19,9 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.validation.Valid; +import java.time.LocalDate; import java.time.ZonedDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -170,6 +172,8 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport } public List findMapSheetMngYyyyList() { + + /* List foundContent = queryFactory .select(mapSheetMngEntity.mngYyyy) @@ -177,6 +181,41 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport .where(mapSheetMngEntity.mngState.ne("COMPLETE")) .orderBy(mapSheetMngEntity.mngYyyy.desc()) .fetch(); + */ + + int currentYear = LocalDate.now().getYear(); + + List foundContentCurrent = + queryFactory + .select(mapSheetMngEntity.mngYyyy) + .from(mapSheetMngEntity) + .where(mapSheetMngEntity.mngYyyy.eq(currentYear)) + .orderBy(mapSheetMngEntity.mngYyyy.desc()) + .fetch(); + + + List foundContent1 = + queryFactory + .select(mapSheetMngEntity.mngYyyy) + .from(mapSheetMngEntity) + .where(mapSheetMngEntity.mngYyyy.ne(currentYear) + .and(mapSheetMngEntity.mngState.ne("NOTYET") + .or(mapSheetMngEntity.mngState.ne("DELETE")))) + .orderBy(mapSheetMngEntity.mngYyyy.desc()) + .fetch(); + + + //if( foundContentCurrent == null || foundContentCurrent.size() == 0) + //{ + //foundContent.add(currentYear); + //} + + List foundContent = new ArrayList<>(); + + foundContent.add(2025); + foundContent.add(2024); + foundContent.add(2023); + foundContent.add(2022); return foundContent; }