|
|
|
@ -236,10 +236,10 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
// 전체 카운트
|
|
|
|
|
long count = query |
|
|
|
|
.select( |
|
|
|
|
qCntrlBasEntity |
|
|
|
|
) |
|
|
|
|
long count = 0; |
|
|
|
|
if(queryList.size() > 0) { |
|
|
|
|
count = query |
|
|
|
|
.select(qCntrlBasEntity) |
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
@ -254,6 +254,9 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.fetchCount(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<AnlsHstryRsModel> result = new ArrayList<>(); |
|
|
|
|
for(AnlsHstryRsModel model: queryList) { |
|
|
|
|