From 66b78022a91345b33fd87d13683361e38b35b57f Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Wed, 4 Mar 2026 22:59:59 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=80=ED=99=94=ED=83=90=EC=A7=80=20selected?= =?UTF-8?q?=20polygon,=20point=20=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangeDetectionRepositoryImpl.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java index 761001fe..6da44ddf 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java @@ -401,15 +401,15 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport // pnu가 들어온 경우 boolean hasPnu = pnu != null && !pnu.isBlank(); + // pnu 가 없을 때 if (!hasPnu) { builder.and( mapSheetAnalDataInferenceGeomEntity .resultUid - .eq(chnDtctId) + .eq(cdObjectId) .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds))); } - // List list = JPAQuery query = queryFactory .select( @@ -436,11 +436,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid)) .innerJoin(mapSheetLearnEntity) .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId)); - // .where(builder) - // .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc()); - // .fetch(); - // 🔥 pnu 조건이면 tb_pnu join 추가 + // pnu 조건이면 tb_pnu join 추가 if (hasPnu) { query .innerJoin(pnuEntity) @@ -499,15 +496,15 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport // pnu가 들어온 경우 boolean hasPnu = pnu != null && !pnu.isBlank(); + // pnu 가 없을 때 if (!hasPnu) { builder.and( mapSheetAnalDataInferenceGeomEntity .resultUid - .eq(chnDtctId) + .eq(cdObjectId) .or(mapSheetAnalDataInferenceGeomEntity.resultUid.in(cdObjectIds))); } - // List list = JPAQuery query = queryFactory .select( @@ -528,10 +525,8 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid)) .innerJoin(mapSheetLearnEntity) .on(mapSheetLearnEntity.id.eq(mapSheetAnalInferenceEntity.learnId)); - // .where(builder) - // .fetch(); - // 🔥 pnu 조건이면 tb_pnu join 추가 + // pnu 조건이면 tb_pnu join 추가 if (hasPnu) { query .innerJoin(pnuEntity)