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 8cd49509..87960427 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 @@ -14,7 +14,6 @@ import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.core.types.dsl.StringExpression; -import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport; @@ -126,11 +125,12 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataGeomEntity.classAfterProb, mapSheetAnalDataGeomEntity.classAfterCd.toUpperCase()))) .from(mapSheetAnalDataGeomEntity) + .innerJoin(mapSheetAnalDataEntity) + .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) + .innerJoin(mapSheetAnalEntity) + .on(mapSheetAnalEntity.id.eq(mapSheetAnalDataEntity.analUid)) .where( - mapSheetAnalDataGeomEntity.dataUid.in( - JPAExpressions.select(mapSheetAnalDataEntity.id) - .from(mapSheetAnalDataEntity) - .where(mapSheetAnalDataEntity.analUid.eq(analUid))), + mapSheetAnalEntity.id.eq(analUid), mapSheetAnalDataGeomEntity.mapSheetNum.eq(Long.valueOf(mapSheetNum))) .fetch(); @@ -212,11 +212,12 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport mapSheetAnalDataGeomEntity.id, mapSheetAnalDataGeomEntity.classAfterCd.toUpperCase()))) .from(mapSheetAnalDataGeomEntity) + .innerJoin(mapSheetAnalDataEntity) + .on(mapSheetAnalDataGeomEntity.dataUid.eq(mapSheetAnalDataEntity.id)) + .innerJoin(mapSheetAnalEntity) + .on(mapSheetAnalEntity.id.eq(mapSheetAnalDataEntity.analUid)) .where( - mapSheetAnalDataGeomEntity.dataUid.in( - JPAExpressions.select(mapSheetAnalDataEntity.id) - .from(mapSheetAnalDataEntity) - .where(mapSheetAnalDataEntity.analUid.eq(analUid))), + mapSheetAnalEntity.id.eq(analUid), mapSheetAnalDataGeomEntity.mapSheetNum.eq(Long.valueOf(mapSheetNum))) .fetch();