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

Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205

Browse Source
This commit is contained in:
sanghyeonhd
2025-11-28 17:01:16 +09:00
parent f83f0b0713 c114915b03
commit 1cc80e2550
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
View File

@@ -184,6 +184,8 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
.join(mapSheetAnalDataGeomEntity) .join(mapSheetAnalDataGeomEntity)
.on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id))
.where(builder) .where(builder)
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch(); .fetch();
long total = long total =
@@ -209,14 +211,12 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
@Override @Override
public List<Long> getSheets(Long id) { public List<Long> getSheets(Long id) {
return queryFactory return queryFactory
.select(mapSheetAnalDataGeomEntity.mapSheetNum) .select(mapSheetAnalDataEntity.mapSheetNum)
.from(mapSheetAnalEntity) .from(mapSheetAnalEntity)
.join(mapSheetAnalDataEntity) .join(mapSheetAnalDataEntity)
.on(mapSheetAnalDataEntity.analUid.eq(mapSheetAnalEntity.id)) .on(mapSheetAnalDataEntity.analUid.eq(mapSheetAnalEntity.id))
.join(mapSheetAnalDataGeomEntity)
.on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id))
.where(mapSheetAnalEntity.id.eq(id)) .where(mapSheetAnalEntity.id.eq(id))
.groupBy(mapSheetAnalDataGeomEntity.mapSheetNum) .groupBy(mapSheetAnalDataEntity.mapSheetNum)
.fetch(); .fetch();
} }
} }

2
src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java
View File

@@ -75,6 +75,8 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
userEntity.createdDttm)) userEntity.createdDttm))
.from(userEntity) .from(userEntity)
.where(builder) .where(builder)
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.orderBy(userEntity.userId.asc()) .orderBy(userEntity.userId.asc())
.fetch(); .fetch();