|
|
@ -753,7 +753,8 @@ public class FltPlanQueryRepository { |
|
|
|
.on(bas.planSno.eq(area.planSno)) |
|
|
|
.on(bas.planSno.eq(area.planSno)) |
|
|
|
.leftJoin(arcrft) |
|
|
|
.leftJoin(arcrft) |
|
|
|
.on(bas.planSno.eq(arcrft.planSno)) |
|
|
|
.on(bas.planSno.eq(arcrft.planSno)) |
|
|
|
.where(builder); |
|
|
|
.where(builder) |
|
|
|
|
|
|
|
.orderBy(bas.createDt.desc()); |
|
|
|
|
|
|
|
|
|
|
|
JPAQuery<?> countQuery = jpaQuery.clone(); |
|
|
|
JPAQuery<?> countQuery = jpaQuery.clone(); |
|
|
|
|
|
|
|
|
|
|
@ -892,7 +893,8 @@ public class FltPlanQueryRepository { |
|
|
|
.on(bas.planSno.eq(area.planSno)) |
|
|
|
.on(bas.planSno.eq(area.planSno)) |
|
|
|
.leftJoin(arcrft) |
|
|
|
.leftJoin(arcrft) |
|
|
|
.on(bas.planSno.eq(arcrft.planSno)) |
|
|
|
.on(bas.planSno.eq(arcrft.planSno)) |
|
|
|
.where(builder); |
|
|
|
.where(builder) |
|
|
|
|
|
|
|
.orderBy(bas.createDt.desc()); |
|
|
|
|
|
|
|
|
|
|
|
List<LaancPlanDto> list = jpaQuery.transform( |
|
|
|
List<LaancPlanDto> list = jpaQuery.transform( |
|
|
|
GroupBy.groupBy(bas.planSno) |
|
|
|
GroupBy.groupBy(bas.planSno) |
|
|
|