MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Moon
2025-12-22 18:23:59 +09:00
parent aa24a3ec2a 09ef03ce68
commit de1f548784
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java
View File

@@ -186,29 +186,33 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
int currentYear = LocalDate.now().getYear(); int currentYear = LocalDate.now().getYear();
List<Integer> foundContentCurrent = List<Integer> foundContentCurrent =
queryFactory queryFactory
.select(mapSheetMngEntity.mngYyyy) .select(mapSheetMngEntity.mngYyyy)
.from(mapSheetMngEntity) .from(mapSheetMngEntity)
.where(mapSheetMngEntity.mngYyyy.eq(currentYear)) .where(mapSheetMngEntity.mngYyyy.eq(currentYear))
.orderBy(mapSheetMngEntity.mngYyyy.desc()) .orderBy(mapSheetMngEntity.mngYyyy.desc())
.fetch(); .fetch();
List<Integer> foundContent1 = List<Integer> foundContent1 =
queryFactory queryFactory
.select(mapSheetMngEntity.mngYyyy) .select(mapSheetMngEntity.mngYyyy)
.from(mapSheetMngEntity) .from(mapSheetMngEntity)
.where(mapSheetMngEntity.mngYyyy.ne(currentYear) .where(
.and(mapSheetMngEntity.mngState.ne("NOTYET") mapSheetMngEntity
.or(mapSheetMngEntity.mngState.ne("DELETE")))) .mngYyyy
.orderBy(mapSheetMngEntity.mngYyyy.desc()) .ne(currentYear)
.fetch(); .and(
mapSheetMngEntity
.mngState
.ne("NOTYET")
.or(mapSheetMngEntity.mngState.ne("DELETE"))))
.orderBy(mapSheetMngEntity.mngYyyy.desc())
.fetch();
// if( foundContentCurrent == null || foundContentCurrent.size() == 0)
//if( foundContentCurrent == null || foundContentCurrent.size() == 0) // {
//{ // foundContent.add(currentYear);
//foundContent.add(currentYear); // }
//}
List<Integer> foundContent = new ArrayList<>(); List<Integer> foundContent = new ArrayList<>();