Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

This commit is contained in:
Moon
2025-12-22 18:23:59 +09:00

View File

@@ -193,22 +193,26 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.orderBy(mapSheetMngEntity.mngYyyy.desc())
.fetch();
List<Integer> foundContent1 =
queryFactory
.select(mapSheetMngEntity.mngYyyy)
.from(mapSheetMngEntity)
.where(mapSheetMngEntity.mngYyyy.ne(currentYear)
.and(mapSheetMngEntity.mngState.ne("NOTYET")
.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<Integer> foundContent = new ArrayList<>();