|
|
|
@ -268,7 +268,11 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
public PageImpl<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Pageable pageable, List<ComIdntfBas> idntfList, List<FltPlanBas> basResult, List<FltPlanBas> pilotResult){ |
|
|
|
|
public PageImpl<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, |
|
|
|
|
Pageable pageable, |
|
|
|
|
List<ComIdntfBas> idntfList, |
|
|
|
|
List<FltPlanBas> basResult, |
|
|
|
|
List<FltPlanBas> pilotResult){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
@ -357,6 +361,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.or(basBuilder) |
|
|
|
|
.or(pilotBuilder))) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.asc()) |
|
|
|
|
.groupBy(qFltPlanBasEntity.planSno) |
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
@ -618,7 +623,10 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public long cntrlBasNormalHstryCount(AnlsHstryGroupModel rq, List<ComIdntfBas> idntfList, List<FltPlanBas> basResult, List<FltPlanBas> pilotResult){ |
|
|
|
|
public long cntrlBasNormalHstryCount(AnlsHstryGroupModel rq, |
|
|
|
|
List<ComIdntfBas> idntfList, |
|
|
|
|
List<FltPlanBas> basResult, |
|
|
|
|
List<FltPlanBas> pilotResult){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
@ -708,6 +716,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.or(basBuilder) |
|
|
|
|
.or(pilotBuilder))) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.asc()) |
|
|
|
|
.groupBy(qFltPlanBasEntity.planSno) |
|
|
|
|
.fetchCount(); |
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
@ -910,8 +919,6 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
@Cacheable(value = "cntrl-count") |
|
|
|
|
public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno) { |
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; |
|
|
|
|
QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; |
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas; |
|
|
|
@ -922,7 +929,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
@ -934,11 +941,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
|
|
|
|
|
long count = query |
|
|
|
|
.select(qCntrlBasEntity) |
|
|
|
|
.from(qComArcrftBasEntity) |
|
|
|
|
.leftJoin(qComIdntfBasEntity) |
|
|
|
|
.on(qComArcrftBasEntity.arcrftSno.eq(qComIdntfBasEntity.arcrftSno)) |
|
|
|
|
.leftJoin(qCntrlBasEntity) |
|
|
|
|
.on(qComIdntfBasEntity.idntfNum.eq(qCntrlBasEntity.idntfNum)) |
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
|
.leftJoin(qFltPlanCtrCntrlRelEntity) |
|
|
|
@ -947,6 +950,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.on(qFltPlanCtrCntrlRelEntity.planSno.eq(qFltPlanBasEntity.planSno)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.desc()) |
|
|
|
|
.groupBy(qCntrlBasEntity.cntrlId) |
|
|
|
|
.fetchCount(); |
|
|
|
|
|
|
|
|
|
return count; |
|
|
|
@ -954,11 +958,9 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Cacheable(value = "cntrl-list") |
|
|
|
|
|
|
|
|
|
public PageImpl<AnlsHstryModel> listCntrlBasRs(AnlsHstryGroupModel rq, Pageable pageable){ |
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; |
|
|
|
|
QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; |
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas; |
|
|
|
@ -969,7 +971,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
@ -991,11 +993,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
qCntrlHstryAreaEntity.landNm, |
|
|
|
|
qCntrlHstryAreaEntity.landNum |
|
|
|
|
)) |
|
|
|
|
.from(qComArcrftBasEntity) |
|
|
|
|
.leftJoin(qComIdntfBasEntity) |
|
|
|
|
.on(qComArcrftBasEntity.arcrftSno.eq(qComIdntfBasEntity.arcrftSno)) |
|
|
|
|
.leftJoin(qCntrlBasEntity) |
|
|
|
|
.on(qComIdntfBasEntity.idntfNum.eq(qCntrlBasEntity.idntfNum)) |
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
|
.leftJoin(qFltPlanCtrCntrlRelEntity) |
|
|
|
@ -1045,7 +1043,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
* @param id |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public PageImpl<AnlsHstryDetailModel> listCntrlHstryPage(String id, Pageable pageable){ |
|
|
|
|
public List<AnlsHstryDetailModel> listCntrlHstryPage(String id){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstry qCtrCntrHstry = QCtrCntrlHstry.ctrCntrlHstry; |
|
|
|
@ -1079,11 +1077,9 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(qCtrCntrHstry.srvrRcvDt.asc()) |
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
|
|
|
|
|
|