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

Merge pull request '영상관리 년도 수정' (#88) from feat/dev_251201 into develop

Browse Source 
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/88
This commit is contained in:
teddy.kim
2025-12-22 17:04:31 +09:00
parent 53d5c533df 09ef03ce68
commit 4f318e32e7
1 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,9 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceContext;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.time.LocalDate;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@@ -170,6 +172,8 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
} }
public List<Integer> findMapSheetMngYyyyList() { public List<Integer> findMapSheetMngYyyyList() {
/*
List<Integer> foundContent = List<Integer> foundContent =
queryFactory queryFactory
.select(mapSheetMngEntity.mngYyyy) .select(mapSheetMngEntity.mngYyyy)
@@ -177,6 +181,45 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.where(mapSheetMngEntity.mngState.ne("COMPLETE")) .where(mapSheetMngEntity.mngState.ne("COMPLETE"))
.orderBy(mapSheetMngEntity.mngYyyy.desc()) .orderBy(mapSheetMngEntity.mngYyyy.desc())
.fetch(); .fetch();
*/
int currentYear = LocalDate.now().getYear();
List<Integer> foundContentCurrent =
queryFactory
.select(mapSheetMngEntity.mngYyyy)
.from(mapSheetMngEntity)
.where(mapSheetMngEntity.mngYyyy.eq(currentYear))
.orderBy(mapSheetMngEntity.mngYyyy.desc())
.fetch();
List<Integer> 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<Integer> foundContent = new ArrayList<>();
foundContent.add(2025);
foundContent.add(2024);
foundContent.add(2023);
foundContent.add(2022);
return foundContent; return foundContent;
} }