|
|
@ -155,8 +155,57 @@ public class CtrCntrlQueryRepository{ |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Cacheable(value = "cntrl-bas") |
|
|
|
@Cacheable(value = "cntrl-count") |
|
|
|
public PageImpl<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno , String userAccount, Pageable pageable){ |
|
|
|
public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno, String userAccount) { |
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
|
|
|
|
QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; |
|
|
|
|
|
|
|
QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; |
|
|
|
|
|
|
|
QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
QPtyCstmrGroup qPtyCstmrGroupEntity = QPtyCstmrGroup.ptyCstmrGroup; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
|
|
|
if(userAccount.equals("USER")) { |
|
|
|
|
|
|
|
builder.and(qFltPlanBasEntity.cstmrSno.eq(cstmrSno)); |
|
|
|
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
long count = query |
|
|
|
|
|
|
|
.select(qCntrlBasEntity) |
|
|
|
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
|
|
|
|
.on(qCntrlHstryAreaEntity.actnType.eq("01")) |
|
|
|
|
|
|
|
.leftJoin(qComIdntfBasEntity) |
|
|
|
|
|
|
|
.on(qCntrlBasEntity.idntfNum.eq(qComIdntfBasEntity.idntfNum)) |
|
|
|
|
|
|
|
.leftJoin(qComArcrftBasEntity) |
|
|
|
|
|
|
|
.on(qComIdntfBasEntity.arcrftSno.eq(qComArcrftBasEntity.arcrftSno)) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanBasEntity) |
|
|
|
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qFltPlanBasEntity.groupId)) |
|
|
|
|
|
|
|
.leftJoin(qPtyCstmrGroupEntity) |
|
|
|
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
|
|
|
.where(builder) |
|
|
|
|
|
|
|
.fetchCount(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return count; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Cacheable(value = "cntrl-list") |
|
|
|
|
|
|
|
public PageImpl<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno, String userAccount, Pageable pageable){ |
|
|
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
@ -237,29 +286,6 @@ public class CtrCntrlQueryRepository{ |
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
.fetch(); |
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
|
|
// 전체 카운트
|
|
|
|
|
|
|
|
long count = 0; |
|
|
|
|
|
|
|
if(queryList.size() > 0) { |
|
|
|
|
|
|
|
count = query |
|
|
|
|
|
|
|
.select(qCntrlBasEntity) |
|
|
|
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
|
|
|
|
.on(qCntrlHstryAreaEntity.actnType.eq("01")) |
|
|
|
|
|
|
|
.leftJoin(qComIdntfBasEntity) |
|
|
|
|
|
|
|
.on(qCntrlBasEntity.idntfNum.eq(qComIdntfBasEntity.idntfNum)) |
|
|
|
|
|
|
|
.leftJoin(qComArcrftBasEntity) |
|
|
|
|
|
|
|
.on(qComIdntfBasEntity.arcrftSno.eq(qComArcrftBasEntity.arcrftSno)) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanBasEntity) |
|
|
|
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qFltPlanBasEntity.groupId)) |
|
|
|
|
|
|
|
.leftJoin(qPtyCstmrGroupEntity) |
|
|
|
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
|
|
|
.where(builder) |
|
|
|
|
|
|
|
.fetchCount(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<AnlsHstryRsModel> result = new ArrayList<>(); |
|
|
|
List<AnlsHstryRsModel> result = new ArrayList<>(); |
|
|
|
for(AnlsHstryRsModel model: queryList) { |
|
|
|
for(AnlsHstryRsModel model: queryList) { |
|
|
|
String addr = ""; |
|
|
|
String addr = ""; |
|
|
@ -286,10 +312,8 @@ public class CtrCntrlQueryRepository{ |
|
|
|
model.setStArea(addr); |
|
|
|
model.setStArea(addr); |
|
|
|
result.add(model); |
|
|
|
result.add(model); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return new PageImpl<>(result, pageable, count); |
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|