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 2a81a762..165bbc8e 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 @@ -186,29 +186,33 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport int currentYear = LocalDate.now().getYear(); List foundContentCurrent = - queryFactory - .select(mapSheetMngEntity.mngYyyy) - .from(mapSheetMngEntity) - .where(mapSheetMngEntity.mngYyyy.eq(currentYear)) - .orderBy(mapSheetMngEntity.mngYyyy.desc()) - .fetch(); - + 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(); + 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); - //} + // if( foundContentCurrent == null || foundContentCurrent.size() == 0) + // { + // foundContent.add(currentYear); + // } List foundContent = new ArrayList<>();